Web build: ease-of-use tweaks for maintainers.

diff --git a/website.make b/website.make
index 5d678b95bb548d7de584d213468f6ae801bfdaad..329b8552adaff703b24ada2625f4d5c850cc338a 100644 (file)
--- a/website.make
+++ b/website.make
@@ -1,10 +1,28 @@
 ################################################################
 # website (without the rest of the docs)
 
-#top-src-dir=$(HOME)/src/lilypond/
-EXTRACT_TEXI_FILENAMES=scripts/build/out/extract_texi_filenames
-CREATE_VERSION=$(top-src-dir)/scripts/build/create-version-itexi.py
-out=out-website
+################################################################
+#####  SECURITY -- change these values for lilypond.org ########
+################################################################
+### for lilypond.org (comment out in git)
+top-src-dir=$(HOME)/src/lilypond/
+trusted-dir=$(HOME)/lilypond/trusted-scripts/
+
+### for normal git (comment out on lilypond.org)
+script-dir=$(top-src-dir)/scripts/build/
+texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+TEXI2HTML=texi2html
+### for lilypond.org (comment out in git)
+#script-dir=$(trusted-dir)
+#texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+#TEXI2HTML=$(HOME)/usr/bin/texi2html
+
+
+################################################################
+
+EXTRACT_TEXI_FILENAMES=python $(script-dir)/extract_texi_filenames.py
+CREATE_VERSION=python $(script-dir)/create-version-itexi.py
+OUT=out-website
 EXAMPLES=$(HOME)/media/examples/
 PICTURES=$(HOME)/media/pictures
 
@@ -13,39 +31,41 @@ PICTURES=$(HOME)/media/pictures
 MANUALS=$(wildcard $(top-src-dir)/Documentation/*.tely)
 MANUALS+=$(top-src-dir)/Documentation/contributor.texi
 
+website-test:
+       echo $(TEXI2HTML)
 
 website-version:
-       mkdir -p $(out)
-       python $(CREATE_VERSION) > $(out)/version.itexi
+       mkdir -p $(OUT)
+       $(CREATE_VERSION) $(top-src-dir) > $(OUT)/version.itexi
 
 website-xrefs: website-version
        $(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
-               -I $(out) -o $(out) --split=node \
+               -I $(OUT) -o $(OUT) --split=node \
                $(top-src-dir)/Documentation/web.texi
        $(foreach manual, $(MANUALS), \
                $(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
-               -I $(out) -o $(out) $(manual) && ) :
+               -I $(OUT) -o $(OUT) $(manual) && ) :
 
 website-texinfo: website-version website-xrefs
        SRC_DIR=$(top-src-dir)/Documentation/ \
-               PERL_UNICODE=SD texi2html --prefix=index \
+               PERL_UNICODE=SD $(TEXI2HTML) --prefix=index \
                --split=section \
                --I=$(top-src-dir)/Documentation/ \
-               --I=$(out) \
-               --init-file=/home/gperciva/src/lilypond/Documentation/lilypond-texi2html.init \
+               --I=$(OUT) \
+               --init-file=$(texi2html-init-file) \
                -D web_version \
-               --output=$(out)/website/ \
+               --output=$(OUT)/website/ \
                $(top-src-dir)/Documentation/web.texi
 
 website-css:
-       cp $(top-src-dir)/Documentation/css/*.css $(out)/website/
+       cp $(top-src-dir)/Documentation/css/*.css $(OUT)/website/
 
 website-pictures:
-       cp -r $(PICTURES) $(out)/website/
-       ln -sf website/pictures $(out)/pictures
+       cp -r $(PICTURES) $(OUT)/website/
+       ln -sf website/pictures $(OUT)/pictures
 
 website-examples:
-       cp -r $(EXAMPLES) $(out)/website/
+       cp -r $(EXAMPLES) $(OUT)/website/
 
 
 website: website-texinfo website-css website-pictures website-examples