Build: website should rely on $LILYPOND_GIT

[lilypond.git] / make / website.make

diff --git a/make/website.make b/make/website.make
index 18da8feba87f335a12fa6b9220e3782ac9f4be09..59ac71d8184cb555a4911aea631898320eea0aae 100644 (file)
--- a/make/website.make
+++ b/make/website.make
@@ -7,7 +7,7 @@
 
 ifeq ($(WEBSITE_ONLY_BUILD),1)
   ### for lilypond.org
-  TOP_SRC_DIR=$(HOME)/lilypond/lilypond-git
+  TOP_SRC_DIR=$(LILYPOND_GIT)
   TRUSTED_DIR=$(HOME)/lilypond/trusted-scripts
   top-src-dir=$(TOP_SRC_DIR)
   depth=.
@@ -16,7 +16,8 @@ ifeq ($(WEBSITE_ONLY_BUILD),1)
   texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init
   top-htaccess=$(trusted-dir)/lilypond.org.htaccess
   dir-htaccess=$(trusted-dir)/website-dir.htaccess
-  TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
+  # grab it from PATH
+  TEXI2HTML_PROGRAM=texi2html
   PYTHON=python
   PYTHONPATH=$(TRUSTED_DIR)
 else
@@ -73,6 +74,7 @@ WEB_BIBS=python $(script-dir)/bib2texi.py
 
 EXAMPLES=$(LILYPOND_WEB_MEDIA_GIT)/ly-examples
 PICTURES=$(LILYPOND_WEB_MEDIA_GIT)/pictures
+PDFS=$(LILYPOND_WEB_MEDIA_GIT)/pdf
 
 SERVER_FILES=$(top-src-dir)/Documentation/web/server
 
@@ -145,6 +147,9 @@ misc-files = $(OUT)/.htaccess \
 picture-src-files := $(notdir $(wildcard $(PICTURES)/*))
 picture-files = $(picture-src-files:%=$(OUT)/website/pictures/%)
 
+pdf-src-files := $(notdir $(wildcard $(PDFS)/*))
+pdf-files = $(pdf-src-files:%=$(OUT)/website/pdf/%)
+
 post-files = $(OUT)/website/index.html
 
 texinfo-files = $(OUT)/index.html $(WEB_LANGS:%=$(OUT)/%/index.html)
@@ -159,7 +164,7 @@ 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 check-setup
+        website-version website-xrefs check-setup website-pdf
 
 check-setup:
 ifeq ($(LILYPOND_WEB_MEDIA_GIT),)
@@ -167,7 +172,7 @@ ifeq ($(LILYPOND_WEB_MEDIA_GIT),)
        exit 1
 endif
 
-website: check-setup website-post website-examples website-pictures website-css website-misc
+website: check-setup website-post website-examples website-pictures website-css website-misc website-pdf
 
 website-bibs: website-version $(OUT) $(bib-files)
 
@@ -179,6 +184,8 @@ website-misc: $(OUT)/website $(misc-files)
 
 website-pictures: $(OUT)/website/pictures $(OUT)/pictures $(picture-files)
 
+website-pdf: $(OUT)/website/pdf $(pdf-files)
+
 website-post: website-texinfo $(post-files)
 
 website-test:
@@ -195,7 +202,7 @@ website-xrefs: website-version $(OUT) $(xref-files)
 ### Rules
 
 # Directories
-$(OUT) $(OUT)/website $(OUT)/website/css $(OUT)/website/ly-examples $(OUT)/website/pictures: %:
+$(OUT) $(OUT)/website $(OUT)/website/css $(OUT)/website/ly-examples $(OUT)/website/pictures $(OUT)/website/pdf: %:
        mkdir -p $@
 
 $(OUT)/pictures: $(OUT)/website/pictures
@@ -265,6 +272,9 @@ $(example-files): $(OUT)/website/ly-examples/%: $(EXAMPLES)/%
 $(picture-files): $(OUT)/website/pictures/%: $(PICTURES)/%
        cp $< $@
 
+$(pdf-files): $(OUT)/website/pdf/%: $(PDFS)/%
+       cp $< $@
+
 $(OUT)/website/favicon.ico: $(SERVER_FILES)/favicon.ico
        cp $< $@