Commit 8289f37b authored by Glenn Morris's avatar Glenn Morris

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.
parent b3edb781
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
......
......@@ -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
......
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
......
......@@ -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
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment