From 8f88a5f91c5a8468d52921f37f4ea4a00ec29498 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 3 Apr 2010 13:01:59 +0200
Subject: [PATCH] Move website.make into make/.  Update relevant documentation.

The new mantra for doing a local lilypond.org test is now

    #! /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 make/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
---
 Documentation/contributor/website-work.itexi | 8 ++++----
 GNUmakefile.in                               | 4 ++--
 website.make => make/website.make            | 0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename website.make => make/website.make (100%)

diff --git a/Documentation/contributor/website-work.itexi b/Documentation/contributor/website-work.itexi
index 65dc3f1098..6b64be18bb 100644
--- a/Documentation/contributor/website-work.itexi
+++ b/Documentation/contributor/website-work.itexi
@@ -74,7 +74,7 @@ Check for any updates to trusted scripts / files:
 #!/bin/sh
 GIT=$HOME/src/lilypond
 DEST=$HOME/lilypond/trusted-scripts
-diff -u $DEST/website.make $GIT/website.make
+diff -u $DEST/website.make $GIT/make/website.make
 diff -u $DEST/lilypond-texi2html.init $GIT/Documentation/lilypond-texi2html.init
 diff -u $DEST/extract_texi_filenames.py $GIT/scripts/build/extract_texi_filenames.py
 diff -u $DEST/create-version-itexi.py $GIT/scripts/build/create-version-itexi.py
@@ -92,7 +92,7 @@ If the changes look ok, make them trusted:
 #!/bin/sh
 GIT=$HOME/src/lilypond
 DEST=$HOME/lilypond/trusted-scripts
-cp $GIT/website.make $DEST/website.make
+cp $GIT/make/website.make $DEST/website.make
 cp $GIT/Documentation/lilypond-texi2html.init $DEST/lilypond-texi2html.init
 cp $GIT/scripts/build/extract_texi_filenames.py $DEST/extract_texi_filenames.py
 cp $GIT/scripts/build/create-version-itexi.py $DEST/create-version-itexi.py
@@ -112,7 +112,7 @@ DEST=$HOME/web/
 cd $HOME/src/build-website
 cp $HOME/lilypond/trusted-scripts/website.make .
 
-make -f website.make WEBSITE_ONLY_BUILD=1 website
+make -f make/website.make WEBSITE_ONLY_BUILD=1 website
 rsync -ra $HOME/src/build-website/out-website/website/ $DEST/website/
 cp $HOME/src/build-website/out-website/pictures $DEST
 cp $HOME/src/build-website/out-website/.htaccess $DEST
@@ -173,7 +173,7 @@ scripts/build/website_post.py
 @item
 Translations are not included by default in @code{make website}.
 To test your translation, edit the @code{WEB_LANGS} line in
-@file{website.make}.  Do not submit a patch to add your language
+@file{make/website.make}.  Do not submit a patch to add your language
 to this file unless @code{make website} completes with less than 5
 warnings.
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index ef32c0080f..7d5bba4d3a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -27,7 +27,7 @@ RELEASE_FILES = ChangeLog RELEASE-COMMIT
 RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
 OUT_DIST_FILES += $(RELEASE_OUT_FILES)
 EXTRA_DIST_FILES = VERSION .gitignore .mailmap \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) website.make
+  $(README_FILES) $(SCRIPTS) $(IN_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -294,6 +294,6 @@ test-snippets-clean:
 website:
 	$(MAKE) config_make=$(config_make) \
 		top-src-dir=$(top-src-dir) \
-		-f $(top-src-dir)/website.make \
+		-f $(top-src-dir)/make/website.make \
 		website
 
diff --git a/website.make b/make/website.make
similarity index 100%
rename from website.make
rename to make/website.make
-- 
2.39.5