more make vars for makeinfo

diff --git a/ChangeLog b/ChangeLog
index 4528062279f30189a0d7fcc263b277cf70811daf..611dda217604369881d3e467da8168881e950823 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-26  Karl Berry  <karl@gnu.org>
+
+       * doc/Makefile (lang_env, makeinfo_prog, manual_opts): new
+       variables to make it easier to override the makeinfo program used.
+
 2011-01-26  Eric Blake  <eblake@redhat.com>
 
        fcntl: work around Haiku F_DUPFD bugs

diff --git a/doc/Makefile b/doc/Makefile
index c40359bb07e8e34b95cc2e4790800b4bb866d898..177760e9c6044448d55c05e1527488f1e472b9c6 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,11 +7,15 @@
 
 doc = gnulib
 
-MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo
-TEXI2HTML = $(MAKEINFO) --no-split --reference-limit=2000 --html
+lang_env = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE=
+makeinfo_prog = makeinfo
+MAKEINFO = $(lang_env) $(makeinfo_prog)
+
+manual_opts = --no-split --reference-limit=2000
+TEXI2HTML = $(MAKEINFO) $(manual_opts) --html
 
 %.info: %.texi
-       LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo --no-split --reference-limit=2000 $<
+       $(MAKEINFO) $(manual_opts) $<
 
 %.html: %.texi
        $(TEXI2HTML) -o $@ $<