doc: Rename .texinfo files to use .texi extension.

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 2a06686d6530013abbbaa8234b08c538d50b8602..54af89a6ffc051248294aebb97f8f1d88990ee87 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-info_TEXINFOS = doc/pspp.texinfo doc/pspp-dev.texinfo
+info_TEXINFOS = doc/pspp.texi doc/pspp-dev.texi
 
 doc_pspp_TEXINFOS = doc/version.texi \
        doc/bugs.texi \
@@ -18,6 +18,7 @@ doc_pspp_TEXINFOS = doc/version.texi \
        doc/invoking.texi \
        doc/language.texi \
        doc/license.texi \
+       doc/pspp-convert.texi \
        doc/ni.texi \
        doc/not-implemented.texi \
        doc/statistics.texi \
@@ -54,10 +55,10 @@ $(srcdir)/doc/tut.texi:
 
 # The SED and AWK filters in this rule, are to work-around some nasty bugs in makeinfo version 4.13, which produces
 # broken docbook xml.  These workarounds are rather horrible and must be removed asap.
-$(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
+$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS)
        @$(MKDIR_P)  doc
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
-               $(top_srcdir)/doc/pspp.texinfo -o - \
+               $(top_srcdir)/doc/pspp.texi -o - \
                | $(SED) -e 's/Time-&-Date/Time-\&-Date/g' \
                -e 's/“/\“/g' \
                -e 's/”/\”/g' \
@@ -80,7 +81,6 @@ docbookdir = $(docdir)
 dist_docbook_DATA = doc/pspp.xml
  
 
-EXTRA_DIST += doc/OChangeLog
 CLEANFILES += pspp-dev.dvi $(docbook_DATA)
 
 doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)