Commit df187c62 authored by Glenn Morris's avatar Glenn Morris
Browse files

Add explicit -I$srcdir to makeinfo in some doc/ Makefiles.

* doc/emacs/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
* doc/lispintro/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
* doc/lispref/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
parent 234db610
2010-10-11 Glenn Morris <rgm@gnu.org> 2010-10-11 Glenn Morris <rgm@gnu.org>
* Makefile.in (MAKEINFO): Add explicit -I$srcdir.
* Makefile.in (.texi.dvi): Remove unnecessary suffix rule. * Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
(DVIPS): New variable. (DVIPS): New variable.
(.PHONY): Add html, ps. (.PHONY): Add html, ps.
......
...@@ -39,7 +39,7 @@ texinfodir = $(srcdir)/../misc ...@@ -39,7 +39,7 @@ texinfodir = $(srcdir)/../misc
# The makeinfo program is part of the Texinfo distribution. # The makeinfo program is part of the Texinfo distribution.
# Use --force so that it generates output even if there are errors. # Use --force so that it generates output even if there are errors.
MAKEINFO = makeinfo --force MAKEINFO = makeinfo --force -I $(srcdir)
TEXI2DVI = texi2dvi TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf TEXI2PDF = texi2pdf
...@@ -129,7 +129,7 @@ ps: emacs.ps ...@@ -129,7 +129,7 @@ ps: emacs.ps
$(infodir)/emacs: ${EMACSSOURCES} $(infodir)/emacs: ${EMACSSOURCES}
$(mkinfodir) $(mkinfodir)
$(MAKEINFO) $< -o $@ $(MAKEINFO) -o $@ $<
emacs.dvi: ${EMACSSOURCES} emacs.dvi: ${EMACSSOURCES}
$(ENVADD) $(TEXI2DVI) $< $(ENVADD) $(TEXI2DVI) $<
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
(ps, emacs-lisp-intro.ps): New targets. (ps, emacs-lisp-intro.ps): New targets.
(clean): Delete ps file. (clean): Delete ps file.
(MAKEINFO): Use --force like the other doc/ Makefiles do. (MAKEINFO): Use --force like the other doc/ Makefiles do.
Add explicit -I$srcdir.
2010-10-09 Glenn Morris <rgm@gnu.org> 2010-10-09 Glenn Morris <rgm@gnu.org>
......
...@@ -28,7 +28,7 @@ infodir = $(srcdir)/../../info ...@@ -28,7 +28,7 @@ infodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file. # Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc texinfodir = $(srcdir)/../misc
MAKEINFO = makeinfo --force MAKEINFO = makeinfo --force -I $(srcdir)
TEXI2DVI = texi2dvi TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf TEXI2PDF = texi2pdf
DVIPS = dvips DVIPS = dvips
......
2010-10-11 Glenn Morris <rgm@gnu.org> 2010-10-11 Glenn Morris <rgm@gnu.org>
* Makefile.in (MAKEINFO): Add explicit -I$srcdir.
* Makefile.in (DVIPS): New variable. * Makefile.in (DVIPS): New variable.
(.PHONY): Add html, ps. (.PHONY): Add html, ps.
(html, elisp.html, ps, elisp.ps): New targets. (html, elisp.html, ps, elisp.ps): New targets.
......
...@@ -32,7 +32,7 @@ texinfodir = $(srcdir)/../misc ...@@ -32,7 +32,7 @@ texinfodir = $(srcdir)/../misc
# Directory with emacsver.texi. # Directory with emacsver.texi.
emacsdir = $(srcdir)/../emacs emacsdir = $(srcdir)/../emacs
MAKEINFO = makeinfo --force -I $(emacsdir) MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir)
TEXI2DVI = texi2dvi TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf TEXI2PDF = texi2pdf
DVIPS = dvips DVIPS = dvips
......
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