[Emacs-diffs] /srv/bzr/emacs/trunk r101907: Add explicit -I$srcdir to makeinfo in some doc/ Makefiles.

[Glenn Morris]

------------------------------------------------------------
revno: 101907
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-10 18:57:48 -0700
message:
  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.
modified:
  doc/emacs/ChangeLog
  doc/emacs/Makefile.in
  doc/lispintro/ChangeLog
  doc/lispintro/Makefile.in
  doc/lispref/ChangeLog
  doc/lispref/Makefile.in

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-10-11 00:43:27 +0000
+++ b/doc/emacs/ChangeLog       2010-10-11 01:57:48 +0000
@@ -1,5 +1,7 @@
 2010-10-11  Glenn Morris  <address@hidden>
 
+       * Makefile.in (MAKEINFO): Add explicit -I$srcdir.
+
        * Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
        (DVIPS): New variable.
        (.PHONY): Add html, ps.

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2010-10-11 00:43:27 +0000
+++ b/doc/emacs/Makefile.in     2010-10-11 01:57:48 +0000
@@ -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) $<

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2010-10-11 00:43:27 +0000
+++ b/doc/lispintro/ChangeLog   2010-10-11 01:57:48 +0000
@@ -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  <address@hidden>
 

=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2010-10-11 00:43:27 +0000
+++ b/doc/lispintro/Makefile.in 2010-10-11 01:57:48 +0000
@@ -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

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-10-11 00:43:27 +0000
+++ b/doc/lispref/ChangeLog     2010-10-11 01:57:48 +0000
@@ -1,5 +1,7 @@
 2010-10-11  Glenn Morris  <address@hidden>
 
+       * Makefile.in (MAKEINFO): Add explicit -I$srcdir.
+
        * Makefile.in (DVIPS): New variable.
        (.PHONY): Add html, ps.
        (html, elisp.html, ps, elisp.ps): New targets.

=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in   2010-10-11 00:43:27 +0000
+++ b/doc/lispref/Makefile.in   2010-10-11 01:57:48 +0000
@@ -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