X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fwebsite.make;h=ad11f04379fc1937646e82df063417a92fb566c7;hb=5d19ffa19f6c98aa6ba3bb95641b6759d6b1cb51;hp=18da8feba87f335a12fa6b9220e3782ac9f4be09;hpb=0f5f5f062fda87919c5ee46dffb58e0e5798b7f4;p=lilypond.git

diff --git a/make/website.make b/make/website.make
index 18da8feba8..ad11f04379 100644
--- 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
@@ -28,6 +29,8 @@ else
   include $(config_make)
 endif
 
+include $(top-src-dir)/VERSION
+
 ################################################################
 #The 4 lines below present an option to force make website to run
 # quietly only when it is run as make -s website.  However, we've
@@ -51,7 +54,7 @@ OUT=out-website
 
 WEB_LANGS := $(shell MAKEWEB=1 $(PYTHON) $(top-src-dir)/python/langdefs.py)
 
-TEXI2HTML=ONLY_WEB=1 TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD \
+TEXI2HTML=ONLY_WEB_VERSION=v$(MAJOR_VERSION).$(MINOR_VERSION) TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD \
 	$(TEXI2HTML_PROGRAM) -D web_version --prefix=index --split=section \
 		--init-file=$(texi2html-init-file) \
 		--I=$(dir $<) \
@@ -73,6 +76,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
 
@@ -137,16 +141,23 @@ css-files = $(css-src-files:%=$(OUT)/website/css/%)
 example-src-files := $(notdir $(wildcard $(EXAMPLES)/*))
 example-files = $(example-src-files:%=$(OUT)/website/ly-examples/%)
 
-misc-files = $(OUT)/.htaccess \
-             $(OUT)/website/.htaccess \
-             $(OUT)/website/favicon.ico \
-             $(OUT)/website/robots.txt
+misc-src-files := $(notdir $(wildcard $(top-src-dir)/Documentation/misc/*.*))
+misc-files += $(misc-src-files:%=$(OUT)/website/misc/%)
 
 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
 
+root-files = $(OUT)/.htaccess \
+             $(OUT)/website/.htaccess \
+             $(OUT)/website/favicon.ico \
+             $(OUT)/website/tweets.xml \
+             $(OUT)/website/robots.txt
+
 texinfo-files = $(OUT)/index.html $(WEB_LANGS:%=$(OUT)/%/index.html)
 
 version-files = $(OUT)/version.itexi $(OUT)/weblinks.itexi
@@ -159,7 +170,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 +178,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)
 
@@ -175,10 +186,12 @@ website-css: $(OUT)/website/css $(css-files)
 
 website-examples: $(OUT)/website/ly-examples $(example-files)
 
-website-misc: $(OUT)/website $(misc-files)
+website-misc: $(OUT)/website $(OUT)/website/misc $(misc-files) $(root-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 +208,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/misc $(OUT)/website/pdf $(OUT)/website/pictures: %:
 	mkdir -p $@
 
 $(OUT)/pictures: $(OUT)/website/pictures
@@ -262,15 +275,24 @@ $(css-files): $(OUT)/website/css/%: $(top-src-dir)/Documentation/css/%
 $(example-files): $(OUT)/website/ly-examples/%: $(EXAMPLES)/%
 	cp $< $@
 
+$(misc-files): $(OUT)/website/misc/%: $(top-src-dir)/Documentation/misc/%
+	cp $< $@
+
 $(picture-files): $(OUT)/website/pictures/%: $(PICTURES)/%
 	cp $< $@
 
+$(pdf-files): $(OUT)/website/pdf/%: $(PDFS)/%
+	cp $< $@
+
 $(OUT)/website/favicon.ico: $(SERVER_FILES)/favicon.ico
 	cp $< $@
 
 $(OUT)/website/robots.txt: $(SERVER_FILES)/robots.txt
 	cp $< $@
 
+$(OUT)/website/tweets.xml: $(SERVER_FILES)/tweets.xml
+	cp $< $@
+
 $(OUT)/.htaccess: $(top-htaccess)
 	cp $< $@