* Makefile.in (MAKEINFO): Now controlled by `configure'.

(MAKEINFO_OPTS): New variable.  Use it where appropriate.
(ENVADD): New variable to control texi2dvi and texi2pdf.

2 files changed, 15 insertions, 5 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 40481acec12..e196b3015bd 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-23  Werner Lemberg  <wl@gnu.org>
+
+        * 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  <cyd@stupidchicken.com>
 
         * files.texi (Directory Names): Move directory-abbrev-alist doc to
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 06adf360f7b..ffe6ac36ef5 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -32,11 +32,15 @@ texinfodir = $(srcdir)/../misc
 # 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 @@ ps: elisp.ps
 
 $(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