website.make: Get some make variables from environment. Fixes debuggability.

If you have a normal lilypond development setup, ie: ~/vc/lilypond, then
something like this script below will allow you to test the website-only
website build.

    #! /bin/sh

    cp -pv Documentation/lilypond-texi2html.init scripts/build
    cp -pv Documentation/web/server/*.htaccess scripts/build

    TEXI2HTML=$(type -p texi2html)
    LILYPOND=$HOME/vc/lilypond
    #from where to copy?
    #ONLINE_ROOT=$LILYPOND/out-www/online-root
    #DOC=$ONLINE_ROOT/Documentation
    DOC=$LILYPOND/Documentation

    make -f website.make website \
      EXAMPLES=$DOC/web/ly-examples/out-www \
      PICTURES=$DOC/pictures/out-www \
      WEBSITE_ONLY_BUILD=1 \
      TOP_SRC_DIR=$(pwd) \
      TRUSTED_DIR=$(pwd)/scripts/build \
      TEXI2HTML_PROGRAM=$TEXI2HTML

diff --git a/website.make b/website.make
index b03012d15113382050afb9f5fa76f22c3e3b6e4d..a681721ffabde549591a6daecc8f49b5f577b0ab 100644 (file)
--- a/website.make
+++ b/website.make
@@ -6,9 +6,11 @@
 ################################################################
 ifeq ($(WEBSITE_ONLY_BUILD),1)
   ### for lilypond.org
-  top-src-dir=$(HOME)/src/lilypond
+  TOP_SRC_DIR=$(HOME)/src/lilypond
+  TRUSTED_DIR=$(HOME)/lilypond/trusted-scripts
+  top-src-dir=$(TOP_SRC_DIR)
   depth=.
-  trusted-dir=$(HOME)/lilypond/trusted-scripts
+  trusted-dir=$(TRUSTED_DIR)
   script-dir=$(trusted-dir)
   texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init
   top-htaccess=$(trusted-dir)/lilypond.org.htaccess