texi2html: fix building language docs with texi2html

The TEXI2HTML vars need to be defined here, too, the definition from
stepmake/stepmake/texinfo-*.make don't work. Also fixed some nasty typos.

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index c71125263c1e778a60e9f14518096b47d651b938..3a56cd2ada4dd1895b9b45909e9d6c0fe3d6b1ae 100644 (file)
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -4,10 +4,12 @@ endif
 
 $(outdir)/%/index.html: $(outdir)/%.texi
        mkdir -p $(dir $@)
-       -$(TEXI2HTML) --I=$(outdir) --output=$(outdir)/@(dir $@) --prefix=index --split=section $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) $<
+       $(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) $<
+       cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 
 $(outdir)/%-big-page.html: $(outdir)/%.texi
-       -$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) $< 
+       $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) $< 
+       cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 
 $(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 5458e90c202ba69e3fa74576cf108c1b19ae64df..c09d1cb0519d8b00d1012d740945280b40562ab4 100644 (file)
--- a/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@ -10,6 +10,10 @@ LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
 MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
+TEXI2HTML_FLAGS = 
+TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init
+TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
+
 TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'
 TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)