Misc small doc/ Makefile cleanup

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

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index c7aa5ac..2919d97 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.
 
@@ -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.
@@ -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 \
@@ -126,36 +124,36 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @${MKDIR_P} ${buildinfodir}
+## Disable implicit rules.
+%.texi: ;
 
-.PHONY: info dvi pdf ps
+.PHONY: info dvi html pdf ps
 
-.SUFFIXES: .ps .dvi
-
-.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)
-       $(mkinfodir)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi
+${buildinfodir}:
+       ${MKDIR_P} $@
+
+$(buildinfodir)/elisp.info: $(srcs) | ${buildinfodir}
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 elisp.dvi: $(srcs)
-       $(ENVADD) $(TEXI2DVI) $(srcdir)/elisp.texi
+       $(ENVADD) $(TEXI2DVI) $<
 
 elisp.html: $(srcs)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $(srcdir)/elisp.texi
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
 
 elisp.pdf: $(srcs)
-       $(ENVADD) $(TEXI2PDF) $(srcdir)/elisp.texi
+       $(ENVADD) $(TEXI2PDF) $<
+
+elisp.ps: elisp.dvi
+       $(DVIPS) -o $@ $<
 
-.PHONY: mostlyclean clean distclean maintainer-clean infoclean
+.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
 
 ## [12] stuff is from two-volume.make.
 mostlyclean:
@@ -169,11 +167,15 @@ clean: mostlyclean
        rm -f emacs-lispref-${version}.tar*
 
 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
+bootstrap-clean maintainer-clean: distclean infoclean
 
 .PHONY: dist
 
@@ -190,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; \
@@ -201,21 +202,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.
@@ -226,20 +227,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