X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=website.make;h=a6752531f89903a69fb8c0881b11f02ef2891159;hb=5e5dc79c133ed6137c3a813fb4edffada083d949;hp=329b8552adaff703b24ada2625f4d5c850cc338a;hpb=5af96d1f6253d3908d20809c3ffb781809c4dfd2;p=lilypond.git

diff --git a/website.make b/website.make
index 329b8552ad..a6752531f8 100644
--- a/website.make
+++ b/website.make
@@ -2,30 +2,39 @@
 # website (without the rest of the docs)
 
 ################################################################
-#####  SECURITY -- change these values for lilypond.org ########
+#####  SECURITY -- check these values for lilypond.org #########
 ################################################################
-### for lilypond.org (comment out in git)
-top-src-dir=$(HOME)/src/lilypond/
-trusted-dir=$(HOME)/lilypond/trusted-scripts/
-
-### for normal git (comment out on lilypond.org)
-script-dir=$(top-src-dir)/scripts/build/
-texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
-TEXI2HTML=texi2html
-### for lilypond.org (comment out in git)
-#script-dir=$(trusted-dir)
-#texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
-#TEXI2HTML=$(HOME)/usr/bin/texi2html
+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) 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
-OUT=out-website
-EXAMPLES=$(HOME)/media/examples/
-PICTURES=$(HOME)/media/pictures
+CREATE_WEBLINKS=python $(script-dir)/create-weblinks-itexi.py
 
+SERVER_FILES=$(top-src-dir)/Documentation/web/server/
 
 # don't include web
 MANUALS=$(wildcard $(top-src-dir)/Documentation/*.tely)
@@ -37,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/ \
@@ -47,8 +57,7 @@ website-xrefs: website-version
 		-I $(OUT) -o $(OUT) $(manual) && ) :
 
 website-texinfo: website-version website-xrefs
-	SRC_DIR=$(top-src-dir)/Documentation/ \
-		PERL_UNICODE=SD $(TEXI2HTML) --prefix=index \
+	$(TEXI2HTML) --prefix=index \
 		--split=section \
 		--I=$(top-src-dir)/Documentation/ \
 		--I=$(OUT) \
@@ -61,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/