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.

2 files changed, 20 insertions, 15 deletions

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