From 3b75ed21eccfd5f1a0d7d61dd5b3c3453a299541 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Wed, 26 Mar 2008 14:40:00 +0100
Subject: [PATCH] texi2html: Update make rules for texi2html (order of the
 args, output files/dirs, etc)

---
 make/doclang-rules.make              | 4 ++--
 make/doclang-vars.make               | 3 ---
 stepmake/stepmake/texinfo-rules.make | 9 ++++-----
 stepmake/stepmake/texinfo-vars.make  | 1 +
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index 979533ea1e..c71125263c 100644
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -4,10 +4,10 @@ endif
 
 $(outdir)/%/index.html: $(outdir)/%.texi
 	mkdir -p $(dir $@)
-	-$(TEXI2HTML) --I=$(outdir) --output=$(outdir)/$* --split=section $(TEXI2HTML_LANG) $<
+	-$(TEXI2HTML) --I=$(outdir) --output=$(outdir)/@(dir $@) --prefix=index --split=section $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) $<
 
 $(outdir)/%-big-page.html: $(outdir)/%.texi
-	-$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_LANG) $< 
+	-$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) $< 
 
 $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po
 	$(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<
diff --git a/make/doclang-vars.make b/make/doclang-vars.make
index ba99a62fcb..28a795b0da 100644
--- a/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@ -11,9 +11,6 @@ LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
 MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
-TEXI2HTML_FLAGS += --init-file=$(top-src-dir)/lilypond-texi2html.init --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES)
-TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
-
 TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'
 TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
 
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index f553eec37f..0db8472d55 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -34,7 +34,7 @@ endif
 ifneq ($(ISOLANG),) 
 TEXI2HTML_LANG = --lang=$ISOLANG
 endif
-TEXI2HTML_FLAGS += --init-file=$(top-src-dir)/lilypond-texi2html.init --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES)
+TEXI2HTML_FLAGS += --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES)
 TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
 
 
@@ -45,15 +45,14 @@ $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.
 
 $(outdir)/%/index.html: $(outdir)/%.texi
 	mkdir -p $(dir $@)
-	$(TEXI2HTML) --I=$(outdir) --output=$@ --split=section $<
-#	$(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --split=section $<
+	$(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=init --split=section $(TEXI2HTML_INIT) $<
 
 # TODO: Pass -D bigpage to texi2html
 $(outdir)/%-big-page.html: $(outdir)/%.texi
-	$(TEXI2HTML) --I=$(outdir) --output=$@ $< 
+	$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $< 
 
 $(outdir)/%.html: $(outdir)/%.texi
-	$(TEXI2HTML) --I=$(outdir) --output=$@ $<
+	$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $<
 
 $(outdir)/%.html.omf: %.texi
 	$(call GENERATE_OMF,html)
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index c9c9c49e73..a510ee05b0 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -16,6 +16,7 @@ MAKEINFO_FLAGS = --enable-encoding -D 'version $(TOPLEVEL_VERSION)'
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
 TEXI2HTML_FLAGS = 
+TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init
 TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
 
 # info stuff
-- 
2.39.5