From df187c6252439abcc958bbeb507344d6781b46e7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 10 Oct 2010 18:57:48 -0700 Subject: [PATCH] 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. --- doc/emacs/ChangeLog | 2 ++ doc/emacs/Makefile.in | 4 ++-- doc/lispintro/ChangeLog | 1 + doc/lispintro/Makefile.in | 2 +- doc/lispref/ChangeLog | 2 ++ doc/lispref/Makefile.in | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 5899e27312..5c0ff3da20 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,7 @@ 2010-10-11 Glenn Morris + * Makefile.in (MAKEINFO): Add explicit -I$srcdir. + * Makefile.in (.texi.dvi): Remove unnecessary suffix rule. (DVIPS): New variable. (.PHONY): Add html, ps. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 1b13c042a8..cdbd718a58 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -39,7 +39,7 @@ texinfodir = $(srcdir)/../misc # 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 $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf @@ -129,7 +129,7 @@ ps: emacs.ps $(infodir)/emacs: ${EMACSSOURCES} $(mkinfodir) - $(MAKEINFO) $< -o $@ + $(MAKEINFO) -o $@ $< emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) $< diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index cd63ecc10d..101e5b1d8b 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -5,6 +5,7 @@ (ps, emacs-lisp-intro.ps): New targets. (clean): Delete ps file. (MAKEINFO): Use --force like the other doc/ Makefiles do. + Add explicit -I$srcdir. 2010-10-09 Glenn Morris diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index c8bd224cf7..366a0a10e5 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -28,7 +28,7 @@ infodir = $(srcdir)/../../info # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc -MAKEINFO = makeinfo --force +MAKEINFO = makeinfo --force -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 213dfa7147..be3e56880f 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2010-10-11 Glenn Morris + * Makefile.in (MAKEINFO): Add explicit -I$srcdir. + * Makefile.in (DVIPS): New variable. (.PHONY): Add html, ps. (html, elisp.html, ps, elisp.ps): New targets. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index 4ba9d82934..f1caa9abfa 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -32,7 +32,7 @@ texinfodir = $(srcdir)/../misc # Directory with emacsver.texi. emacsdir = $(srcdir)/../emacs -MAKEINFO = makeinfo --force -I $(emacsdir) +MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -- 2.20.1