[Emacs-diffs] /srv/bzr/emacs/trunk r102955: Improve configuration of makeinfo.

[Werner Lemberg]

------------------------------------------------------------
revno: 102955
committer: Werner Lemberg <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-23 11:34:39 +0100
message:
  Improve configuration of makeinfo.
  
  * Makefile.in (MAKEINFO): Now controlled by `configure'.
  (MAKEINFO_OPTS): New variable.  Use it where appropriate.
  (ENVADD): Updated.
modified:
  doc/emacs/ChangeLog
  doc/emacs/Makefile.in

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-01-18 08:22:22 +0000
+++ b/doc/emacs/ChangeLog       2011-01-23 10:34:39 +0000
@@ -1,3 +1,9 @@
+2011-01-23  Werner Lemberg  <address@hidden>
+
+       * Makefile.in (MAKEINFO): Now controlled by `configure'.
+       (MAKEINFO_OPTS): New variable.  Use it where appropriate.
+       (ENVADD): Updated.
+
 2011-01-18  Glenn Morris  <address@hidden>
 
        * ack.texi, emacs.texi (Acknowledgments): Update for ERT addition.

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2011-01-16 02:21:30 +0000
+++ b/doc/emacs/Makefile.in     2011-01-23 10:34:39 +0000
@@ -39,14 +39,16 @@
 
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force -I $(srcdir)
+MAKEINFO = @MAKEINFO@
+MAKEINFO_OPTS = --force -I $(srcdir)
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
 
 
-ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" 
MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
+         MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
 
 EMACS_XTRA= \
@@ -129,7 +131,7 @@
 
 $(infodir)/emacs: ${EMACSSOURCES}
        $(mkinfodir)
-       $(MAKEINFO) -o $@ $<
+       $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
 
 emacs.dvi: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2DVI) $<
@@ -141,7 +143,7 @@
        $(ENVADD) $(TEXI2PDF) $<
 
 emacs.html: ${EMACSSOURCES}
-       $(MAKEINFO) --html -o $@ $<
+       $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
 
 emacs-xtra.dvi: $(EMACS_XTRA)
        $(ENVADD) $(TEXI2DVI) $<