From: Glenn Morris <rgm@gnu.org>
Date: Mon, 11 Oct 2010 01:57:48 +0000 (-0700)
Subject: Add explicit -I$srcdir to makeinfo in some doc/ Makefiles.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~68
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df187c6252439abcc958bbeb507344d6781b46e7;p=emacs.git

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 5899e273124..5c0ff3da206 100644
--- 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 1b13c042a8b..cdbd718a58d 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 cd63ecc10db..101e5b1d8b7 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  <rgm@gnu.org>
 
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index c8bd224cf70..366a0a10e5d 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 213dfa7147b..be3e56880f5 100644
--- 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 4ba9d829340..f1caa9abfa2 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