Website: use external $LILYPOND_WEB_MEDIA_GIT

[lilypond.git] / make / website.make

diff --git a/make/website.make b/make/website.make
index 0b164e44a81c95a68038926475794abf8b92c415..d6d9ef7a12a09b921b922214370820e51edae311 100644 (file)
--- 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
@@ -106,7 +104,7 @@ MANUALS_BASE = $(basename $(MANUALS) $(MANUALS_WEB))
 bib-files = $(OUT)/others-did.itexi $(OUT)/we-wrote.itexi
 
 css-src-files := $(notdir $(wildcard $(top-src-dir)/Documentation/css/*.css))
-css-files = $(css-src-files:%=$(OUT)/website/%)
+css-files = $(css-src-files:%=$(OUT)/website/css/%)
 
 example-src-files := $(notdir $(wildcard $(EXAMPLES)/*))
 example-files = $(example-src-files:%=$(OUT)/website/ly-examples/%)
@@ -133,13 +131,19 @@ 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)
 
-website-css: $(OUT)/website $(css-files)
+website-css: $(OUT)/website/css $(css-files)
 
 website-examples: $(OUT)/website/ly-examples $(example-files)
 
@@ -163,7 +167,7 @@ website-xrefs: website-version $(OUT) $(xref-files)
 ### Rules
 
 # Directories
-$(OUT) $(OUT)/website $(OUT)/website/ly-examples $(OUT)/website/pictures: %:
+$(OUT) $(OUT)/website $(OUT)/website/css $(OUT)/website/ly-examples $(OUT)/website/pictures: %:
        mkdir -p $@
 
 $(OUT)/pictures: $(OUT)/website/pictures
@@ -224,7 +228,7 @@ $(OUT)/website/index.html: $(wildcard $(OUT)/*.html)
        $(WEB_POST) $(OUT)/website
 
 # Simple copy
-$(css-files): $(OUT)/website/%: $(top-src-dir)/Documentation/css/%
+$(css-files): $(OUT)/website/css/%: $(top-src-dir)/Documentation/css/%
        cp $< $@
 
 $(example-files): $(OUT)/website/ly-examples/%: $(EXAMPLES)/%