Web build: fix search box.

diff --git a/Documentation/lilypond-texi2html.init b/Documentation/lilypond-texi2html.init
index 1ff5d8ade87ecf79fbb8388667df7547e91bc03c..edd22bf1611317919aeebcb5385fcc6ee4dc11c7 100644 (file)
--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -1060,17 +1060,14 @@ sub lilypond_generate_page_toc_body($)
       push (@toc_entries, generate_ly_toc_entries($_, \%parentelements, $page_toc_depth));
     }
     # search box
-    if ($sergsmoeivjriohuemf) {
-        # WTF, perl needs 6 lines of magic to do: ' ' + open ('file-name').read ()?
-       local $/=undef;
-        my $name = "search-box.html";
-       open FILE, "$ENV{SRC_DIR}/$name" or open FILE, "$ENV{SRC_DIR}/../$name" or die "no such file: $name: $!";
-
-       my $string = <FILE>;
-       $string =  "<li>\n" . $string . "</li>\n";
-       push (@toc_entries, $string);
-       close FILE;
-    }
+    local $/=undef;
+    my $name = "search-box.html";
+    open FILE, "$ENV{TOP_SRC_DIR}/Documentation/$name" or die "no such file: $name: $!";
+    my $search_string = <FILE>;
+    $search_string = "<li>\n" . $search_string . "</li>\n";
+    push (@toc_entries, $search_string);
+    close FILE;
+
     push (@toc_entries, "</ul>\n");
     if ($web_manual) {
        push (@toc_entries, "\n");

diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 54472bfe05c6737ed369280387a30eb1e0c04941..40faf01c3ca0c6859463be6a2251a7412d85b889 100644 (file)
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -61,7 +61,7 @@ TEXI2HTML_SPLIT = --prefix=index --split=section
 
 TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) 
-TEXI2HTML = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+TEXI2HTML = TOP_SRC_DIR=$(top-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 28253e5225a13c206aa82fdc235f286466b24932..4c990d9f042b9164afa2f743356c2b6ed66f07fa 100644 (file)
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -33,7 +33,7 @@ TEXI2HTML_SPLIT = --prefix=index --split=section
 
 TEXI2HTML_INCLUDES += --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
-TEXI2HTML = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
 
 

diff --git a/website.make b/website.make
index 42d240d1bd53d0a2fc2fdd45cf2b363a9667a773..5e1e9ce22e894ab16ce26f43be4003762eda27e1 100644 (file)
--- a/website.make
+++ b/website.make
@@ -22,7 +22,7 @@ endif
 ################################################################
 OUT=out-website
 
-TEXI2HTML = SRC_DIR=$(top-src-dir)/Documentation/ PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 
 EXTRACT_TEXI_FILENAMES=python $(script-dir)/extract_texi_filenames.py
 CREATE_VERSION=python $(script-dir)/create-version-itexi.py