Web build: move /media/ into shared /lilypond/ dir.

diff --git a/Documentation/contributor/website-work.itexi b/Documentation/contributor/website-work.itexi
index 30958a23f338b774a1ed2366acc2631215ac5364..4921da3a54ba7af308f329826dadb081050784cc 100644 (file)
--- a/Documentation/contributor/website-work.itexi
+++ b/Documentation/contributor/website-work.itexi
@@ -88,7 +88,7 @@ security concerns), the @file{Documentation/@/pictures/} and
 @file{Documentation/@/web/@/ly-examples/} directories are
 @strong{not} compiled.  You need to upload them, and if they ever
 change, a user in the @code{lilypond} group must upload them to
-@file{~graham/@/media} on the host.
+@file{~graham/@/lilypond@/media} on the host.
 
 Upload latest pictures/ and ly-examples/ (local script):
 
@@ -104,8 +104,8 @@ PICS=$BUILD_DIR/Documentation/pictures/out-www/
 EXAMPLES=$BUILD_DIR/Documentation/web/ly-examples/out-www/
 
 cd $BUILD_DIR
-rsync -a $PICS graham@lilypond.org:media/pictures
-rsync -a $EXAMPLES graham@lilypond.org:ly-examples
+rsync -a $PICS graham@lilypond.org:lilypond/media/pictures
+rsync -a $EXAMPLES graham@lilypond.org:lilypond/media/ly-examples
 @end verbatim
 
 

diff --git a/make/website.make b/make/website.make
index 2928f53b064d10e00def3dc263faf5606c978a7e..060ca8b3c9052baf6816ec05c31de37768d4b17b 100644 (file)
--- a/make/website.make
+++ b/make/website.make
@@ -16,8 +16,8 @@ ifeq ($(WEBSITE_ONLY_BUILD),1)
   top-htaccess=$(trusted-dir)/lilypond.org.htaccess
   dir-htaccess=$(trusted-dir)/website-dir.htaccess
   TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
-  EXAMPLES=$(HOME)/media/ly-examples/
-  PICTURES=$(HOME)/media/pictures
+  EXAMPLES=$(HOME)/lilypond/media/ly-examples/
+  PICTURES=$(HOME)/lilypond/media/pictures
 else
   ### for normal git
   script-dir=$(top-src-dir)/scripts/build/