Improve configuration of makeinfo.

* 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/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 4320a29f60f..416b53576b6 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/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.
+
 2010-11-13  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi: Rename the `count-words-region' example,
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 9dc31978630..46325a327a5 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -28,11 +28,15 @@ infodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
-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) $(MAKEINFO_OPTS)"
+
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
 .PHONY: info dvi html pdf ps
@@ -48,19 +52,19 @@ ps: emacs-lisp-intro.ps
 # -NN extensions to fit into DOS 8+3 limits without clashing.
 ${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
         $(mkinfodir)
-        $(MAKEINFO) -o $@ $<
+        $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
 
 emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
-        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
+        $(ENVADD) $(TEXI2DVI) $<
 
 emacs-lisp-intro.ps: emacs-lisp-intro.dvi
         $(DVIPS) -o $@ $<
 
 emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
-        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
+        $(ENVADD) $(TEXI2PDF) $<
 
 emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
-        $(MAKEINFO) --html -o $@ $<
+        $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean