From 4cfdc6bddeddeaac41e5a55e3301905e13a9df31 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Tue, 1 Apr 2008 02:21:02 +0200 Subject: [PATCH] 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. --- make/doclang-rules.make | 6 ++++-- make/doclang-vars.make | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/make/doclang-rules.make b/make/doclang-rules.make index c71125263c..3a56cd2ada 100644 --- 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 5458e90c20..c09d1cb051 100644 --- 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) -- 2.39.5