From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 12 Aug 2009 19:09:46 +0000 (+0200)
Subject: WEB: Fix TEXI2HTML include ordering.  Fixes translated web sites.
X-Git-Tag: release/2.13.4-1~179^2~94
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a9decf16124c4f948d24f9d7453e319c677df46a;p=lilypond.git

WEB: Fix TEXI2HTML include ordering.  Fixes translated web sites.
---

diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make
index c7d8d4a99c..446ae2e45c 100644
--- a/make/doc-i18n-root-rules.make
+++ b/make/doc-i18n-root-rules.make
@@ -4,15 +4,14 @@ $(outdir)/%.texi: %.texi
 $(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES)
 	mkdir -p $(dir $@)
 	mkdir -p $(outdir)/$*
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_SPLIT) --output=$(outdir)/$* $<
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(TEXI2HTML_SPLIT) --output=$(outdir)/$* $<
 	find $(outdir)/$* -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/$(outdir)
 
 $(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES)
-	echo foebar
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage --output=$@ $<
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage --output=$@ $<
 
 $(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(outdir)/version.itexi
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$@ $<
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $<
 
 $(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.texi
 	cd $(outdir) && \
diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 4219dbf393..602351cb98 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -61,9 +61,9 @@ $(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
 $(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
 	TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT)
 
-TEXI2HTML_INCLUDES += $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
+TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
-TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
+TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
 
 TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 3d95b1bccf..808c89f87d 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -30,14 +30,14 @@ $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-
 	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
 
 $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage --output=$@ $<
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage --output=$@ $<
 
 $(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$@ $<
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $<
 
 $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(outdir)/%.html.omf
 	mkdir -p $(dir $@)
-	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$(dir $@) $(TEXI2HTML_SPLIT) $<
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$(dir $@) $(TEXI2HTML_SPLIT) $<
 	cp $(top-src-dir)/Documentation/css/*.css $(dir $@)
 
 $(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index c6104cc359..5489d0ebf6 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -35,9 +35,9 @@ DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
 WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
 TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
 
-TEXI2HTML_INCLUDES += $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
+TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
-TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
+TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########