From 8289f37b64d3734339f8c82a1e444113873d8d25 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Thu, 28 Oct 2010 00:21:43 -0700
Subject: [PATCH] doc/Makefile fixes related to inclusion of emacsver.texi.

* doc/lispref/Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir.

* doc/misc/Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path.
(($(infodir)/calc, calc.dvi, calc.pdf): Depend on emacsver.texi.
($(infodir)/efaq): Remove -I option now in $MAKEINFO.
---
 doc/lispref/ChangeLog   |  4 ++++
 doc/lispref/Makefile.in |  4 ++--
 doc/misc/ChangeLog      |  6 ++++++
 doc/misc/Makefile.in    | 14 +++++++-------
 doc/misc/calc.texi      |  6 +-----
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 53e1a77bab8..afd20c3890a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-28  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir.
+
 2010-10-24  Eli Zaretskii  <eliz@gnu.org>
 
 	* display.texi (Window Systems): Deprecate use of window-system as
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index f1caa9abfa2..be8b6ca2c9e 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -109,7 +109,7 @@ $(infodir)/elisp: $(srcs)
 	$(MAKEINFO) -o $@ $<
 
 elisp.dvi: $(srcs)
-	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
+	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $<
 
 elisp.html: $(srcs)
 	$(MAKEINFO) --html -o $@ $<
@@ -118,7 +118,7 @@ elisp.ps: elisp.dvi
 	$(DVIPS) -o $@ $<
 
 elisp.pdf: $(srcs)
-	$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
+	$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index cde97d40fa5..029d2e039bb 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-28  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path.
+	(($(infodir)/calc, calc.dvi, calc.pdf): Depend on emacsver.texi.
+	($(infodir)/efaq): Remove -I option now in $MAKEINFO.
+
 2010-10-25  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa.texi (Mail-mode integration): Add alternative key bindings
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index d5afabd0374..deeafa2c1b2 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -37,12 +37,12 @@ VPATH=@srcdir@
 ## Note that the setfilename command in the .texi files assumes this.
 infodir=../../info
 ## Directory with emacsver.texi.
-## Currently only used by efaq; could be added to MAKEINFO.
+## Currently only used by efaq and calc.
 emacsdir = $(srcdir)/../emacs
 
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force -I$(emacsdir)
 
 # Also add new entries to INFO_FILES in the top-level Makefile.in.
 INFO_TARGETS = \
@@ -198,7 +198,7 @@ PDF_TARGETS = \
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 
-ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
 mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
@@ -244,12 +244,12 @@ autotype.pdf: ${srcdir}/autotype.texi
 	$(ENVADD) $(TEXI2PDF) $<
 
 calc : $(infodir)/calc
-$(infodir)/calc: calc.texi
+$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $<
-calc.dvi: ${srcdir}/calc.texi
+calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2DVI) $<
-calc.pdf: ${srcdir}/calc.texi
+calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2PDF) $<
 
 ccmode : $(infodir)/ccmode
@@ -381,7 +381,7 @@ eudc.pdf: ${srcdir}/eudc.texi
 efaq : $(infodir)/efaq
 $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
 	$(mkinfodir)
-	cd $(srcdir); $(MAKEINFO) -I $(emacsdir) $<
+	cd $(srcdir); $(MAKEINFO) $<
 faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2DVI) $<
 faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index f76eeaf884d..9c30556ab78 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -7,7 +7,7 @@
 @setchapternewpage odd
 @comment %**end of header (This is for running Texinfo on a region.)
 
-@include ../emacs/emacsver.texi
+@include emacsver.texi
 
 @c The following macros are used for conditional output for single lines.
 @c @texline foo
@@ -36585,7 +36585,3 @@ the corresponding full Lisp name is derived by adding a prefix of
 
 @bye
 
-
-@ignore
-   arch-tag: 77a71809-fa4d-40be-b2cc-da3e8fb137c0
-@end ignore
-- 
2.39.5