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.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5899e27312442b73109829a00160216670b50859..5c0ff3da2067811862e2579b65da8457361ca944 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-11  Glenn Morris  <rgm@gnu.org>
 
+       * 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 1b13c042a8b636b2d6d50e0904fa98d388b3ed33..cdbd718a58d06b090260a8bc20bb5b34767f067b 100644 (file)
--- 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 cd63ecc10dbafd23ff2972a8bb78147fc7b3fc11..101e5b1d8b73c10ebae3dedda680f80123cd08e8 100644 (file)
--- 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  <rgm@gnu.org>
 

diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index c8bd224cf709758a9be01f82064517fc5274e13a..366a0a10e5dbcbd4b70fe6e9da7981ff89c0e15b 100644 (file)
--- 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 213dfa7147b90105a3bfa1a276de137ccb6cd234..be3e56880f53aaf4211db61f4a1971b7136abe90 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-11  Glenn Morris  <rgm@gnu.org>
 
+       * 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 4ba9d8293400ad770ea747b904f4474634286bc1..f1caa9abfa2b0b5bdab74896ddfbcb3b5bcfb4e4 100644 (file)
--- 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