Misc small doc/ Makefile cleanup

* emacs/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with pattern rule.
(${buildinfodir}): New rule.
($(buildinfodir)/emacs.info): Use order-only prereq for output dir.  Use $<.
(emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf): Use $<.
(%.ps): New rule.

* lispintro/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with explicit rule.
(${buildinfodir}): New rule.
(${buildinfodir}/eintr.info): Use order-only prereq for output dir.  Use $<.
(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.
(emacs-lisp-intro.ps): New rule.

* lispref/Makefile.in (mkinfodir): Remove.
(.dvi.ps): Replace with explicit rule.
(html): Declare as PHONY.
(${buildinfodir}): New rule.
($(buildinfodir)/elisp.info): Use order-only prereq for output dir.  Use $<.
(elisp.dvi, elisp.html, elisp.pdf): Use $<.
(elisp.ps): New rule.

6 files changed, 61 insertions, 47 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 65f2db31d84..a85b56c3af7 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,6 +1,14 @@
 2014-06-23  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (%.texi): Disable implicit rules.
+        (mkinfodir): Remove.
+        (.dvi.ps): Replace with pattern rule.
+        (${buildinfodir}): New rule.
+        ($(buildinfodir)/emacs.info): Use order-only prereq for output dir.
+        Use $<.
+        (emacs.dvi, emacs.pdf, emacs.html, emacs-xtra.dvi, emacs-xtra.pdf):
+        Use $<.
+        (%.ps): New rule.
 
 2014-06-15  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 91f4d655c08..98ff81791ac 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -142,47 +142,44 @@ EMACSSOURCES= \
         ${srcdir}/kmacro.texi \
         $(EMACS_XTRA)
 
-## The info/ directory exists in release tarfiles but not the repository.
-mkinfodir = @${MKDIR_P} ${buildinfodir}
-
 ## Disable implicit rules.
 %.texi: ;
 
 .PHONY: info dvi html pdf ps
 
-.SUFFIXES: .ps .dvi
-
-.dvi.ps:
-        $(DVIPS) -o $@ $<
-
 info: $(buildinfodir)/emacs.info
 dvi: $(DVI_TARGETS)
 html: $(HTML_TARGETS)
 pdf: $(PDF_TARGETS)
 ps: $(PS_TARGETS)
 
+## The info/ directory exists in release tarfiles but not the repository.
+${buildinfodir}:
+        ${MKDIR_P} $@
+
 # Note that all the Info targets build the Info files in srcdir.
 # 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: ${EMACSSOURCES}
-        $(mkinfodir)
-        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi
+$(buildinfodir)/emacs.info: ${EMACSSOURCES} | ${buildinfodir}
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 emacs.dvi: ${EMACSSOURCES}
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
+        $(ENVADD) $(TEXI2DVI) $<
 
 emacs.pdf: ${EMACSSOURCES}
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 emacs.html: ${EMACSSOURCES}
-        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs.texi
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
 
 emacs-xtra.dvi: $(EMACS_XTRA)
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
+        $(ENVADD) $(TEXI2DVI) $<
 
 emacs-xtra.pdf: $(EMACS_XTRA)
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-xtra.texi
+        $(ENVADD) $(TEXI2PDF) $<
+
+%.ps: %.dvi
+        $(DVIPS) -o $@ $<
 
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
 
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 53271427afa..13bc65eef4a 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,6 +1,14 @@
 2014-06-23  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (%.texi): Disable implicit rules.
+        (mkinfodir): Remove.
+        (.dvi.ps): Replace with explicit rule.
+        (${buildinfodir}): New rule.
+        (${buildinfodir}/eintr.info): Use order-only prereq for output dir.
+        Use $<.
+        (emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html):
+        Use $<.
+        (emacs-lisp-intro.ps): New rule.
 
 2014-06-15  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 8f9b2eec279..b40c26767cc 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -66,8 +66,6 @@ HTML_TARGETS = emacs-lisp-intro.html
 PDF_TARGETS = emacs-lisp-intro.pdf
 PS_TARGETS = emacs-lisp-intro.ps
 
-mkinfodir = @${MKDIR_P} ${buildinfodir}
-
 srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
   ${emacsdir}/emacsver.texi
 
@@ -76,33 +74,31 @@ srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
 
 .PHONY: info dvi html pdf ps
 
-.SUFFIXES: .ps .dvi
-
-.dvi.ps:
-        $(DVIPS) -o $@ $<
-
 info: ${buildinfodir}/eintr.info
-
 dvi: $(DVI_TARGETS)
 html: $(HTML_TARGETS)
 pdf: $(PDF_TARGETS)
 ps: $(PS_TARGETS)
 
+${buildinfodir}:
+        ${MKDIR_P} $@
+
 # The file name eintr must fit within 5 characters, to allow for
 # -NN extensions to fit into DOS 8+3 limits without clashing.
-# Note: "<" is not portable in ordinary make rules.
-${buildinfodir}/eintr.info: ${srcs}
-        $(mkinfodir)
-        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
+${buildinfodir}/eintr.info: ${srcs} | ${buildinfodir}
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 emacs-lisp-intro.dvi: ${srcs}
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi
+        $(ENVADD) $(TEXI2DVI) $<
 
 emacs-lisp-intro.pdf: ${srcs}
-        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-lisp-intro.texi
+        $(ENVADD) $(TEXI2PDF) $<
 
 emacs-lisp-intro.html: ${srcs}
-        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
+        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
+
+emacs-lisp-intro.ps: emacs-lisp-intro.dvi
+        $(DVIPS) -o $@ $<
 
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
 
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 813f1f5d5b7..2d202715a0b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,6 +1,14 @@
 2014-06-23  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (%.texi): Disable implicit rules.
+        (mkinfodir): Remove.
+        (.dvi.ps): Replace with explicit rule.
+        (html): Declare as PHONY.
+        (${buildinfodir}): New rule.
+        ($(buildinfodir)/elisp.info): Use order-only prereq for output dir.
+        Use $<.
+        (elisp.dvi, elisp.html, elisp.pdf): Use $<.
+        (elisp.ps): New rule.
 
 2014-06-21  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index f468a31cb42..2919d97b3a3 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -124,17 +124,10 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @${MKDIR_P} ${buildinfodir}
-
 ## Disable implicit rules.
 %.texi: ;
 
-.PHONY: info dvi pdf ps
-
-.SUFFIXES: .ps .dvi
-
-.dvi.ps:
-        $(DVIPS) -o $@ $<
+.PHONY: info dvi html pdf ps
 
 info: $(buildinfodir)/elisp.info
 dvi: $(DVI_TARGETS)
@@ -142,19 +135,23 @@ html: $(HTML_TARGETS)
 pdf: $(PDF_TARGETS)
 ps: $(PS_TARGETS)
 
-## Note: "<" is not portable in ordinary make rules.
-$(buildinfodir)/elisp.info: $(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 bootstrap-clean maintainer-clean infoclean