X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fwebsite.make;h=d6d9ef7a12a09b921b922214370820e51edae311;hb=a65ce2f47dce9385c6270704228e55a6cb3c40b5;hp=3bb0faca5397de53015d0b316ee56e945620ce13;hpb=7a5ed5ba18cd1b11b9468e6e6d45ab1c8987923a;p=lilypond.git

diff --git a/make/website.make b/make/website.make
index 3bb0faca53..d6d9ef7a12 100644
--- a/make/website.make
+++ b/make/website.make
@@ -17,8 +17,6 @@ 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)/lilypond/media/ly-examples
-  PICTURES=$(HOME)/lilypond/media/pictures
   PYTHON=python
   PYTHONPATH=$(TRUSTED_DIR)
 else
@@ -28,9 +26,6 @@ else
   top-htaccess=$(top-src-dir)/Documentation/web/server/lilypond.org.htaccess
   dir-htaccess=$(top-src-dir)/Documentation/web/server/website-dir.htaccess
   include $(config_make)
-  # I assume this is run from top-build-dir
-  EXAMPLES=Documentation/web/ly-examples/out-www
-  PICTURES=Documentation/pictures/out-www
 endif
 
 ################################################################
@@ -76,6 +71,9 @@ MASS_LINK=python $(script-dir)/mass-link.py
 WEB_POST=python $(script-dir)/website_post.py
 WEB_BIBS=python $(script-dir)/bib2texi.py
 
+EXAMPLES=$(LILYPOND_WEB_MEDIA_GIT)/ly-examples
+PICTURES=$(LILYPOND_WEB_MEDIA_GIT)/pictures
+
 SERVER_FILES=$(top-src-dir)/Documentation/web/server
 
 # don't include web
@@ -133,9 +131,15 @@ xref-files = $(MANUALS_BASE:%=$(OUT)/%.xref-map)
 
 .PHONY: website website-bibs website-css website-examples website-misc \
         website-pictures website-post website-test website-texinfo \
-        website-version website-xrefs
+        website-version website-xrefs check-setup
+
+check-setup:
+ifeq ($(LILYPOND_WEB_MEDIA_GIT),)
+	echo "Need a $LILYPOND_WEB_MEDIA_GIT environment variable!"
+	exit 1
+endif
 
-website: website-post website-examples website-pictures website-css website-misc
+website: check-setup website-post website-examples website-pictures website-css website-misc
 
 website-bibs: website-version $(OUT) $(bib-files)