Mercurial > emacs

changeset 110913:1ba912b1a63c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Glenn Morris <rgm@gnu.org>
date Sun, 10 Oct 2010 18:57:48 -0700
parents 2bfb6bf8a383
children ccdc694ce7bd
files doc/emacs/ChangeLog doc/emacs/Makefile.in doc/lispintro/ChangeLog doc/lispintro/Makefile.in doc/lispref/ChangeLog doc/lispref/Makefile.in
diffstat 6 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/doc/emacs/ChangeLog	Sun Oct 10 17:43:27 2010 -0700
+++ b/doc/emacs/ChangeLog	Sun Oct 10 18:57:48 2010 -0700
@@ -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.
--- a/doc/emacs/Makefile.in	Sun Oct 10 17:43:27 2010 -0700
+++ b/doc/emacs/Makefile.in	Sun Oct 10 18:57:48 2010 -0700
@@ -39,7 +39,7 @@
 
 # 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 @@
 
 $(infodir)/emacs: ${EMACSSOURCES}
 	$(mkinfodir)
-	$(MAKEINFO) $< -o $@
+	$(MAKEINFO) -o $@ $<
 
 emacs.dvi: ${EMACSSOURCES}
 	$(ENVADD) $(TEXI2DVI) $<
--- a/doc/lispintro/ChangeLog	Sun Oct 10 17:43:27 2010 -0700
+++ b/doc/lispintro/ChangeLog	Sun Oct 10 18:57:48 2010 -0700
@@ -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>
 
--- a/doc/lispintro/Makefile.in	Sun Oct 10 17:43:27 2010 -0700
+++ b/doc/lispintro/Makefile.in	Sun Oct 10 18:57:48 2010 -0700
@@ -28,7 +28,7 @@
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
--- a/doc/lispref/ChangeLog	Sun Oct 10 17:43:27 2010 -0700
+++ b/doc/lispref/ChangeLog	Sun Oct 10 18:57:48 2010 -0700
@@ -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.
--- a/doc/lispref/Makefile.in	Sun Oct 10 17:43:27 2010 -0700
+++ b/doc/lispref/Makefile.in	Sun Oct 10 18:57:48 2010 -0700
@@ -32,7 +32,7 @@
 # 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