Add .info extension to @setfilename commands in doc/

[bpt/emacs.git] / doc / lispref / Makefile.in

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index d734875..2fbba4d 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1990-1996, 1998-2013 Free Software Foundation, Inc.
+# Copyright (C) 1990-1996, 1998-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -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@
@@ -76,7 +75,6 @@ srcs = \
   $(srcdir)/elisp.texi \
   $(emacsdir)/emacsver.texi \
   $(srcdir)/abbrevs.texi \
-  $(srcdir)/advice.texi \
   $(srcdir)/anti.texi \
   $(srcdir)/backups.texi \
   $(srcdir)/buffers.texi \
@@ -135,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,7 +170,10 @@ distclean: clean
        rm -f Makefile
 
 infoclean:
-       -cd $(buildinfodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9]
+       rm -f \
+         $(buildinfodir)/elisp.info \
+         $(buildinfodir)/elisp.info-[1-9] \
+         $(buildinfodir)/elisp.info-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 
@@ -191,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; \