From: John Mandereau <john.mandereau@gmail.com>
Date: Thu, 10 Apr 2008 06:03:45 +0000 (+0200)
Subject: Thinko
X-Git-Tag: release/2.11.58-1~32^2~149
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=744e5ffdfdbbd49ba12b9e56c3ab21d9b8040ee0;p=lilypond.git

Thinko

Oops, put back TEXI2HTML_INIT after other cmdline options.
Thanks to Reinhold.
---

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index 94f77806bf..8e6feffeb3 100644
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,10 +1,10 @@
 $(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES)
 	mkdir -p $(dir $@)
-	$(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $<
+	$(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
 	cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 
 $(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES)
-	$(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $<
+	$(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
 	cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 
 $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po
diff --git a/make/doclang-vars.make b/make/doclang-vars.make
index 4b94169c83..230e511721 100644
--- a/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@ -13,9 +13,9 @@ LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
 MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
-TEXI2HTML_LANG=--lang=$(ISOLANG)
 TEXI2HTML_INIT= --init-file=$(top-src-dir)/lilypond-texi2html.init
-TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(TEXI2HTML_INIT)
+TEXI2HTML_LANG=--lang=$(ISOLANG)
+TEXI2HTML_FLAGS += $(TEXI2HTML_LANG)
 TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM)
 
 TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'