X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=website.make;h=1920c2654fd8f84debfb14d155555b4cec7c7d74;hb=6171423c08cd7fe1010e4d1b4a3e6f172fe9b016;hp=2f8a2eaebfcdc9f227444ba88d1f528708abe879;hpb=ef3f586830c85fc9e6bf0f82917eecef0258b07e;p=lilypond.git

diff --git a/website.make b/website.make
index 2f8a2eaebf..1920c2654f 100644
--- a/website.make
+++ b/website.make
@@ -7,29 +7,34 @@
 ifeq ($(WEBSITE_ONLY_BUILD),1)
   ### for lilypond.org
   top-src-dir=$(HOME)/src/lilypond
+  depth=.
   trusted-dir=$(HOME)/lilypond/trusted-scripts
   script-dir=$(trusted-dir)
   texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init
   TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
+  EXAMPLES=$(HOME)/media/ly-examples/
+  PICTURES=$(HOME)/media/pictures
 else
   ### for normal git
   script-dir=$(top-src-dir)/scripts/build/
   texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
   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
 
 
 ################################################################
 OUT=out-website
 
-TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+TEXI2HTML=ONLY_WEB=1 TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 
 EXTRACT_TEXI_FILENAMES=python $(script-dir)/extract_texi_filenames.py
 CREATE_VERSION=python $(script-dir)/create-version-itexi.py
+CREATE_WEBLINKS=python $(script-dir)/create-weblinks-itexi.py
 
-EXAMPLES=$(HOME)/media/ly-examples/
-PICTURES=$(HOME)/media/pictures
-
+SERVER_FILES=$(top-src-dir)/Documentation/web/server/
 
 # don't include web
 MANUALS=$(wildcard $(top-src-dir)/Documentation/*.tely)
@@ -41,6 +46,7 @@ website-test:
 website-version:
 	mkdir -p $(OUT)
 	$(CREATE_VERSION) $(top-src-dir) > $(OUT)/version.itexi
+	$(CREATE_WEBLINKS) $(top-src-dir) > $(OUT)/weblinks.itexi
 
 website-xrefs: website-version
 	$(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
@@ -64,13 +70,16 @@ website-css:
 	cp $(top-src-dir)/Documentation/css/*.css $(OUT)/website/
 
 website-pictures:
-	cp -r $(PICTURES) $(OUT)/website/
+	mkdir -p $(OUT)/website/pictures/
+	cp $(PICTURES)/* $(OUT)/website/pictures/
 	ln -sf website/pictures $(OUT)/pictures
 
 website-examples:
-	cp -r $(EXAMPLES) $(OUT)/website/
-
+	mkdir -p $(OUT)/website/ly-examples
+	cp $(EXAMPLES)/* $(OUT)/website/ly-examples
 
 website: website-texinfo website-css website-pictures website-examples
-
+	cp $(SERVER_FILES)/favicon.ico $(OUT)/website/
+	cp $(SERVER_FILES)/lilypond.org.htaccess $(OUT)/website/.htaccess
+	cp $(SERVER_FILES)/robots.txt $(OUT)/website/