Get rid of the INFO_EXT variable

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

diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 7aeead4..6bf8302 100644 (file)
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 1994, 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # NB If you add any more configure variables,
 # update the sed rules in the dist target below.
@@ -54,12 +54,11 @@ GZIP_PROG = @GZIP_PROG@
 
 HTML_OPTS = --no-split --html
 
-INFO_EXT=@INFO_EXT@
 # Options used only when making info output.
 # --no-split is only needed because of MS-DOS.
 # For a possible alternative, see
 # http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html
-INFO_OPTS=@INFO_OPTS@
+INFO_OPTS= --no-split
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -143,8 +142,7 @@ EMACSSOURCES= \
        ${srcdir}/kmacro.texi \
        $(EMACS_XTRA)
 
-## This seems pointless.  The info/ directory exists in both the
-## repository and the release tarfiles.
+## The info/ directory exists in release tarfiles but not the repository.
 mkinfodir = @${MKDIR_P} ${buildinfodir}
 
 .PHONY: info dvi html pdf ps
@@ -154,7 +152,7 @@ mkinfodir = @${MKDIR_P} ${buildinfodir}
 .dvi.ps:
        $(DVIPS) -o $@ $<
 
-info: $(buildinfodir)/emacs$(INFO_EXT)
+info: $(buildinfodir)/emacs.info
 dvi: $(DVI_TARGETS)
 html: $(HTML_TARGETS)
 pdf: $(PDF_TARGETS)
@@ -164,7 +162,7 @@ ps: $(PS_TARGETS)
 # There is no provision for Info files to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.
 # Note: "<" is not portable in ordinary make rules.
-$(buildinfodir)/emacs$(INFO_EXT): ${EMACSSOURCES}
+$(buildinfodir)/emacs.info: ${EMACSSOURCES}
        $(mkinfodir)
        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi
 
@@ -196,10 +194,14 @@ clean: mostlyclean
        rm -f emacs-manual-${version}.tar*
 
 distclean: clean
+       rm -f Makefile
 
 ## In the standalone tarfile, the clean rule runs this.
 infoclean:
-       -cd $(buildinfodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9]
+       rm -f \
+         $(buildinfodir)/emacs.info \
+         $(buildinfodir)/emacs.info-[1-9] \
+         $(buildinfodir)/emacs.info-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 
@@ -217,7 +219,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-manual-${version}/Makefile
        @if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
          echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
@@ -229,21 +230,21 @@ dist:
 .PHONY: install-dvi install-html install-pdf install-ps install-doc
 
 install-dvi: dvi
-       umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir)
-       $(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir)
+       umask 022; $(MKDIR_P) "$(DESTDIR)$(dvidir)"
+       $(INSTALL_DATA) $(DVI_TARGETS) "$(DESTDIR)$(dvidir)"
 install-html: html
-       umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir)
-       $(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir)
+       umask 022; $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+       $(INSTALL_DATA) $(HTML_TARGETS) "$(DESTDIR)$(htmldir)"
 install-pdf: pdf
-        umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir)
-       $(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir)
+        umask 022;$(MKDIR_P) "$(DESTDIR)$(pdfdir)"
+       $(INSTALL_DATA) $(PDF_TARGETS) "$(DESTDIR)$(pdfdir)"
 install-ps: ps
-       umask 022; $(MKDIR_P) $(DESTDIR)$(psdir)
+       umask 022; $(MKDIR_P) "$(DESTDIR)$(psdir)"
        for file in $(PS_TARGETS); do \
-         $(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \
+         $(INSTALL_DATA) $${file} "$(DESTDIR)$(psdir)"; \
          [ -n "${GZIP_PROG}" ] || continue; \
-         rm -f $(DESTDIR)$(psdir)/$${file}.gz; \
-         ${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \
+         rm -f "$(DESTDIR)$(psdir)/$${file}.gz"; \
+         ${GZIP_PROG} -9n "$(DESTDIR)$(psdir)/$${file}"; \
        done
 
 ## Top-level Makefile installs the info pages.
@@ -254,20 +255,20 @@ install-doc: install-dvi install-html install-pdf install-ps
 
 uninstall-dvi:
        for file in $(DVI_TARGETS); do \
-         rm -f $(DESTDIR)$(dvidir)/$${file}; \
+         rm -f "$(DESTDIR)$(dvidir)/$${file}"; \
        done
 uninstall-html:
        for file in $(HTML_TARGETS); do \
-         rm -f $(DESTDIR)$(htmldir)/$${file}; \
+         rm -f "$(DESTDIR)$(htmldir)/$${file}"; \
        done
 uninstall-ps:
        ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
        for file in $(PS_TARGETS); do \
-         rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \
+         rm -f "$(DESTDIR)$(psdir)/$${file}$${ext}"; \
        done
 uninstall-pdf:
        for file in $(PDF_TARGETS); do \
-         rm -f $(DESTDIR)$(pdfdir)/$${file}; \
+         rm -f "$(DESTDIR)$(pdfdir)/$${file}"; \
        done
 
 uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps