Get rid of the INFO_EXT variable

It's never been anything more than pointless complexity

* configure.ac (INFO_EXT, INFO_OPTS): Remove output variables.

* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.

* doc/emacs/Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.

* doc/lispintro/Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.

* doc/lispref/Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.

* doc/misc/Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
(INFO_OPTS): Set directly rather than with configure.

2 files changed, 11 insertions, 8 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d859e0f01a9..fd50c2aebdc 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-10  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
+        (INFO_OPTS): Set directly rather than with configure.
+
 2014-06-09  Paul Eggert  <eggert@cs.ucla.edu>
 
         Say (accept-process-output P)'s result pertains to P if P is non-nil.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index e7bfedfa583..2fbba4d0d59 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -49,9 +49,8 @@ GZIP_PROG = @GZIP_PROG@
 
 HTML_OPTS = --no-split --html
 
-INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
-INFO_OPTS=@INFO_OPTS@
+INFO_OPTS= --no-split
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -134,14 +133,14 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
 .dvi.ps:
         $(DVIPS) -o $@ $<
 
-info: $(buildinfodir)/elisp$(INFO_EXT)
+info: $(buildinfodir)/elisp.info
 dvi: $(DVI_TARGETS)
 html: $(HTML_TARGETS)
 pdf: $(PDF_TARGETS)
 ps: $(PS_TARGETS)
 
 ## Note: "<" is not portable in ordinary make rules.
-$(buildinfodir)/elisp$(INFO_EXT): $(srcs)
+$(buildinfodir)/elisp.info: $(srcs)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi
 
@@ -172,9 +171,9 @@ distclean: clean
 
 infoclean:
         rm -f \
-          $(buildinfodir)/elisp$(INFO_EXT) \
-          $(buildinfodir)/elisp$(INFO_EXT)-[1-9] \
-          $(buildinfodir)/elisp$(INFO_EXT)-[1-9][0-9]
+          $(buildinfodir)/elisp.info \
+          $(buildinfodir)/elisp.info-[1-9] \
+          $(buildinfodir)/elisp.info-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 
@@ -193,7 +192,6 @@ dist:
           -e 's/^\(clean:.*\)/\1 infoclean/' \
           -e "s/@ver[s]ion@/${version}/" \
           -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
-          -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
           ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
         @if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
           echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \