texi2html: Update make rules for texi2html (order of the args, output files/dirs...

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index 979533ea1ef92bced86f3e757589e3e72e9fa973..c71125263c1e778a60e9f14518096b47d651b938 100644 (file)
--- 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 ba99a62fcb7f21f9a160f0a0ab70d3c0af642e60..28a795b0da9bc9f789f467934866aecb4cf16301 100644 (file)
--- 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 f553eec37ffc33d7bdaa32c00c2ad39af1b38775..0db8472d553e69bd9c15118cf193537c8a52cc84 100644 (file)
--- 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 c9c9c49e73619e9883a20bc51e9aa5f5f8183ae3..a510ee05b041474866806388d72d57057e558427 100644 (file)
--- 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