From: Glenn Morris <rgm@gnu.org>
Date: Mon, 1 Oct 2012 00:05:20 +0000 (-0700)
Subject: Tweak reftex.texi's inclusion of emacsver.texi
X-Git-Tag: emacs-24.2.90~241^2~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07f133bf5d9e1c3da32eca2e2024b47cbfaef26d;p=emacs.git

Tweak reftex.texi's inclusion of emacsver.texi

* doc/misc/Makefile.in ($(buildinfodir)/reftex$(INFO_EXT)), reftex.dvi)
(reftex.pdf): Add dependency on emacsver.texi.
* doc/misc/reftex.texi: Don't include directory part for emacsver.texi;
the Makefile's -I handles it.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8ddfb5fcbf4..7b77540a923 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-01  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in ($(buildinfodir)/reftex$(INFO_EXT)), reftex.dvi)
+	(reftex.pdf): Add dependency on emacsver.texi.
+	* reftex.texi: Don't include directory part for emacsver.texi;
+	the Makefile's -I handles it.
+
 2012-09-30  Ralf Angeli  <angeli@caeruleus.net>
 
 	Merge from standalone RefTeX repository.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index c42a10b88bc..cc76d53a8a9 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -526,12 +526,12 @@ rcirc.pdf: ${srcdir}/rcirc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
 
 reftex : $(buildinfodir)/reftex$(INFO_EXT)
-$(buildinfodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi
+$(buildinfodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi
 	$(mkinfodir)
 	$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi
-reftex.dvi: ${srcdir}/reftex.texi
+reftex.dvi: ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
-reftex.pdf: ${srcdir}/reftex.texi
+reftex.pdf: ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
 
 remember : $(buildinfodir)/remember$(INFO_EXT)
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index c7efa875dc7..1ffa2473b27 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -27,7 +27,7 @@ Con@TeX{}t
 \gdef\ConTeXt{Con\TeX t}
 @end tex
 
-@include ../emacs/emacsver.texi
+@include emacsver.texi
 
 @set VERSION @value{EMACSVER}
 @set AUCTEXSITE @uref{http://www.gnu.org/software/auctex/,@AUCTeX{} web site}