From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 22 Sep 2009 07:04:59 +0000 (+0200)
Subject: Pass $(src-dir) to texi2html through environment SRC_DIR.  Fixes doc build.
X-Git-Tag: release/2.13.4-1~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3543425fe170a38ad0d4fd212bdb44ed79768e2d;p=lilypond.git

Pass $(src-dir) to texi2html through environment SRC_DIR.  Fixes doc build.

See

    http://lists.gnu.org/archive/html/lilypond-devel/2009-09/msg00520.html

Using this environment variable hack, as I have no clue how to add
nice arguments or defines to texi2html.
---

diff --git a/Documentation/web-texi2html.init b/Documentation/web-texi2html.init
index dc43e52fbb..68dc5f78f7 100644
--- a/Documentation/web-texi2html.init
+++ b/Documentation/web-texi2html.init
@@ -759,8 +759,8 @@ sub lilypond_generate_page_toc_body($)
     if (!exists($main::value{'shallow_toc'})) {
 # WTF, perl needs 6 lines of magic to do: ' ' + open ('file-name').read ()?
 	local $/=undef;
-        my $name = 'search-box.html';
-	open FILE, $name or open FILE, "../$name" or die  die "no such file: $name: $!";
+        my $name = "search-box.html";
+	open FILE, $name or open FILE, "$ENV{SRC_DIR}/$name" or die  die "no such file: $name: $!";
 
 # All these also seems to work, but fail silently.  Great, it runs!
 # It's late already, let's this broken site.
diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 9f07562bf8..f0f6ed183f 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -63,7 +63,7 @@ $(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
 
 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 = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
 
 TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 3f6deada2f..27eb4edcf6 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -37,7 +37,7 @@ TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
 
 TEXI2HTML_INCLUDES += --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 = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########