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 94f77806bf907b27eebc31bb1a746c7b710dea93..8e6feffeb34a411f2868c2a572b9f26b13ac700a 100644 (file)
--- 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 4b94169c83c1876113c1c2dc082dfb2af488b4aa..230e511721e54c2c9fbb21b19e99dc6a8b797441 100644 (file)
--- 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)'