From eef3ab9443a2cef449d08aa8832f96007fc3a36b Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 9 Oct 2010 12:39:42 -0700
Subject: [PATCH] Use $< in some doc/*/Makefile rules.

* doc/lispref/Makefile.in (srcs): Put elisp.texi first.
($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<.

* doc/lispintro/Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi)
(emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.

* doc/emacs/Makefile.in (EMACSSOURCES): Put emacs.texi first.
($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi)
(emacs-xtra.pdf): Use $<.
---
 doc/emacs/ChangeLog       |  4 ++++
 doc/emacs/Makefile.in     | 12 ++++++------
 doc/lispintro/ChangeLog   |  3 +++
 doc/lispintro/Makefile.in |  8 ++++----
 doc/lispref/ChangeLog     |  3 +++
 doc/lispref/Makefile.in   |  8 ++++----
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2082fda3a48..bac01f7d1ce 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (EMACSSOURCES): Put emacs.texi first.
+	($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi)
+	(emacs-xtra.pdf): Use $<.
+
 	* Makefile.in (infoclean): Remove harmless, long-standing error.
 
 	* Makefile.in ($(infodir)): Delete rule.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 8f23099f668..7a029482161 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -70,8 +70,8 @@ EMACS_XTRA= \
 	$(srcdir)/msdog-xtra.texi
 
 EMACSSOURCES= \
-	${srcdir}/emacsver.texi \
 	${srcdir}/emacs.texi \
+	${srcdir}/emacsver.texi \
 	${srcdir}/doclicense.texi \
 	${srcdir}/gpl.texi \
 	${srcdir}/screen.texi \
@@ -135,20 +135,20 @@ pdf: emacs.pdf
 
 $(infodir)/emacs: ${EMACSSOURCES}
 	$(mkinfodir)
-	cd $(srcdir); $(MAKEINFO) emacs.texi -o $@
+	cd $(srcdir); $(MAKEINFO) $< -o $@
 
 emacs.dvi: ${EMACSSOURCES}
-	$(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
+	$(ENVADD) $(TEXI2DVI) $<
 
 emacs.pdf: ${EMACSSOURCES}
-	$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs.texi
+	$(ENVADD) $(TEXI2PDF) $<
 
 
 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) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean
 
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index b8d8f1e29b0..a2e5e1a44c3 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi)
+	(emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.
+
 	* Makefile.in (infoclean): Remove harmless, long-standing error.
 
 	* Makefile.in ($(infodir)): Delete rule.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index d50bc8bf8ac..7a33190273c 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -50,16 +50,16 @@ pdf: emacs-lisp-intro.pdf
 # -NN extensions to fit into DOS 8+3 limits without clashing.
 ${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
 	$(mkinfodir)
-	cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $@
+	cd $(srcdir); $(MAKEINFO) $< -o $@
 
 emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
-	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $^
+	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
 
 emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
-	$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $^
+	$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
 
 emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
-	$(MAKEINFO) --html -o $@ $^
+	$(MAKEINFO) --html -o $@ $<
 
 .dvi.ps:
 	$(DVIPS) $< -o $@
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 187567c67a2..ee8d7502bc5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (srcs): Put elisp.texi first.
+	($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<.
+
 	* Makefile.in (infoclean): Remove harmless, long-standing error.
 
 	* Makefile.in ($(infodir)): Delete rule.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index ec570e8000b..8a21fa9c08b 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -42,6 +42,7 @@ TEXI2PDF = texi2pdf
 # List of all the texinfo files in the manual:
 
 srcs = \
+  $(srcdir)/elisp.texi \
   $(emacsdir)/emacsver.texi \
   $(srcdir)/abbrevs.texi \
   $(srcdir)/advice.texi \
@@ -56,7 +57,6 @@ srcs = \
   $(srcdir)/debugging.texi \
   $(srcdir)/display.texi \
   $(srcdir)/edebug.texi \
-  $(srcdir)/elisp.texi \
   $(srcdir)/errors.texi \
   $(srcdir)/eval.texi \
   $(srcdir)/files.texi \
@@ -107,13 +107,13 @@ pdf: elisp.pdf
 
 $(infodir)/elisp: $(srcs)
 	$(mkinfodir)
-	cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) elisp.texi -o $@
+	cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) $< -o $@
 
 elisp.dvi: $(srcs)
-	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
+	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
 
 elisp.pdf: $(srcs)
-	$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
+	$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean
 
-- 
2.39.5