From 4226cf28cbf8b81423e6a1ee4075020f55e320d8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Jan 2011 10:48:09 -0800 Subject: [PATCH] more make vars for makeinfo --- ChangeLog | 5 +++++ doc/Makefile | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 452806227..611dda217 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-01-26 Karl Berry + + * 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 fcntl: work around Haiku F_DUPFD bugs diff --git a/doc/Makefile b/doc/Makefile index c40359bb0..177760e9c 100644 --- 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 $@ $< -- 2.11.0