MAKEINFO variable not honoured

[Werner LEMBERG]

[revno 102734]

For testing purposes, I have installed the current development
version of makeinfo in /usr/local/bin.  Since this isn't ready yet for
production purposes (it's unbearably slow), I configured emacs with

   MAKEINFO=/usr/bin/makeinfo ./configure

However, during `make bootstrap', this variable isn't honoured since
the sub-Makefiles in the `doc' subdirectory contain lines like this

  MAKEINFO = makeinfo --force -I $(srcdir)

which directly overwrite the MAKEINFO variable.

Below a trivial patch which fixes this.


    Werner


======================================================================


--- ./doc/lispref/Makefile.in.old       2011-01-01 12:51:56.000000000 +0100
+++ ./doc/lispref/Makefile.in   2011-01-01 13:18:04.000000000 +0100
@@ -32,7 +32,7 @@
 # Directory with emacsver.texi.
 emacsdir =  $(srcdir)/../emacs
 
-MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir)
+MAKEINFO = @MAKEINFO@ --force -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
--- ./doc/lispintro/Makefile.in.old     2011-01-01 12:51:51.000000000 +0100
+++ ./doc/lispintro/Makefile.in 2011-01-01 13:17:47.000000000 +0100
@@ -28,7 +28,7 @@
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
-MAKEINFO = makeinfo --force -I $(srcdir)
+MAKEINFO = @MAKEINFO@ --force -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
--- ./doc/emacs/Makefile.in.old 2011-01-01 12:51:51.000000000 +0100
+++ ./doc/emacs/Makefile.in     2011-01-01 13:17:15.000000000 +0100
@@ -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 -I $(srcdir)
+MAKEINFO = @MAKEINFO@ --force -I $(srcdir)
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
--- ./doc/misc/Makefile.in.old  2011-01-01 12:51:56.000000000 +0100
+++ ./doc/misc/Makefile.in      2011-01-01 13:18:23.000000000 +0100
@@ -42,7 +42,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 -I$(emacsdir)
+MAKEINFO = @MAKEINFO@ --force -I$(emacsdir)
 
 # Also add new entries to INFO_FILES in the top-level Makefile.in.
 INFO_TARGETS = \