aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-09-30 17:05:20 -0700
committerGlenn Morris2012-09-30 17:05:20 -0700
commit07f133bf5d9e1c3da32eca2e2024b47cbfaef26d (patch)
tree9a4533ec0e03f44f1b7db7cc9b10ca2d944e515c
parentc22bac2cc59c6c04924ecf62c5eeb97a92df7e28 (diff)
downloademacs-07f133bf5d9e1c3da32eca2e2024b47cbfaef26d.tar.gz
emacs-07f133bf5d9e1c3da32eca2e2024b47cbfaef26d.zip
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.
-rw-r--r--doc/misc/ChangeLog7
-rw-r--r--doc/misc/Makefile.in6
-rw-r--r--doc/misc/reftex.texi2
3 files changed, 11 insertions, 4 deletions
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 @@
12012-10-01 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in ($(buildinfodir)/reftex$(INFO_EXT)), reftex.dvi)
4 (reftex.pdf): Add dependency on emacsver.texi.
5 * reftex.texi: Don't include directory part for emacsver.texi;
6 the Makefile's -I handles it.
7
12012-09-30 Ralf Angeli <angeli@caeruleus.net> 82012-09-30 Ralf Angeli <angeli@caeruleus.net>
2 9
3 Merge from standalone RefTeX repository. 10 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
526 $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi 526 $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
527 527
528reftex : $(buildinfodir)/reftex$(INFO_EXT) 528reftex : $(buildinfodir)/reftex$(INFO_EXT)
529$(buildinfodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi 529$(buildinfodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi
530 $(mkinfodir) 530 $(mkinfodir)
531 $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi 531 $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi
532reftex.dvi: ${srcdir}/reftex.texi 532reftex.dvi: ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi
533 $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi 533 $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
534reftex.pdf: ${srcdir}/reftex.texi 534reftex.pdf: ${srcdir}/reftex.texi $(emacsdir)/emacsver.texi
535 $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi 535 $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
536 536
537remember : $(buildinfodir)/remember$(INFO_EXT) 537remember : $(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
27\gdef\ConTeXt{Con\TeX t} 27\gdef\ConTeXt{Con\TeX t}
28@end tex 28@end tex
29 29
30@include ../emacs/emacsver.texi 30@include emacsver.texi
31 31
32@set VERSION @value{EMACSVER} 32@set VERSION @value{EMACSVER}
33@set AUCTEXSITE @uref{http://www.gnu.org/software/auctex/,@AUCTeX{} web site} 33@set AUCTEXSITE @uref{http://www.gnu.org/software/auctex/,@AUCTeX{} web site}