[Emacs-diffs] /srv/bzr/emacs/trunk r102953: * Makefile.in (MAKEINFO): Now controlled by `configure'.

[Werner Lemberg]

------------------------------------------------------------
revno: 102953
committer: Werner Lemberg <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-23 11:22:21 +0100
message:
  * Makefile.in (MAKEINFO): Now controlled by `configure'.
  (MAKEINFO_OPTS): New variable.  Use it where appropriate.
  (ENVADD): New variable to control texi2dvi and texi2pdf.
modified:
  doc/lispref/ChangeLog
  doc/lispref/Makefile.in

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-01-15 20:38:27 +0000
+++ b/doc/lispref/ChangeLog     2011-01-23 10:22:21 +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): New variable to control texi2dvi and texi2pdf.
+
 2011-01-15  Chong Yidong  <address@hidden>
 
        * files.texi (Directory Names): Move directory-abbrev-alist doc to

=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in   2011-01-14 17:18:41 +0000
+++ b/doc/lispref/Makefile.in   2011-01-23 10:22:21 +0000
@@ -32,11 +32,15 @@
 # Directory with emacsver.texi.
 emacsdir =  $(srcdir)/../emacs
 
-MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir)
+MAKEINFO = @MAKEINFO@
+MAKEINFO_OPTS = --force -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
 
+ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
+         MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
+
 # List of all the texinfo files in the manual:
 
 srcs = \
@@ -106,19 +110,19 @@
 
 $(infodir)/elisp: $(srcs)
        $(mkinfodir)
-       $(MAKEINFO) -o $@ $<
+       $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
 
 elisp.dvi: $(srcs)
-       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $<
+       $(ENVADD) $(TEXI2DVI) $<
 
 elisp.html: $(srcs)
-       $(MAKEINFO) --html -o $@ $<
+       $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
 
 elisp.ps: elisp.dvi
        $(DVIPS) -o $@ $<
 
 elisp.pdf: $(srcs)
-       $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $<
+       $(ENVADD) $(TEXI2PDF) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean