X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fwebsite.make;h=55e2331633765bdbf3b2694eda40b069e7c469c6;hb=0960f475b89981a7568e9fc629f93c983c0cf5d0;hp=7d6ed7cb84f1d6e107e6514d7526b2f27362ec50;hpb=3c6c00c08ff31f57ec8d88450b4e4e7917bc4f3e;p=lilypond.git

diff --git a/make/website.make b/make/website.make
index 7d6ed7cb84..55e2331633 100644
--- a/make/website.make
+++ b/make/website.make
@@ -4,6 +4,7 @@
 ################################################################
 #####  SECURITY -- check these values for lilypond.org #########
 ################################################################
+
 ifeq ($(WEBSITE_ONLY_BUILD),1)
   ### for lilypond.org
   TOP_SRC_DIR=$(HOME)/lilypond/lilypond-git
@@ -30,6 +31,25 @@ else
   PICTURES=Documentation/pictures/out-www
 endif
 
+################################################################
+#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
+# decided not to use this switch, and run the scripts quietly all
+# the time
+################################################################
+#quiet-run = $(findstring s, $(MAKEFLAGS))
+#ifeq ($(quiet-run),s)
+#  quiet-flag=-q
+#endif
+
+#Nothing clever here - just allows the use of a boolean to control
+#  quiet running
+quiet-run = true
+ifeq ($(quiet-run),true)
+  quiet-flag=-q
+endif
+
+
 
 ################################################################
 OUT=out-website
@@ -68,6 +88,8 @@ website-xrefs: website-version
 			-I $(top-src-dir)/Documentation \
 			-I $(top-src-dir)/Documentation/"$$l" \
 			-I $(OUT) -o $(OUT) --split=node \
+			--known-missing-files=$(top-src-dir)/scripts/build/website-known-missing-files.txt \
+			$(quiet-flag) \
 			$(top-src-dir)/Documentation/"$$l"/web.texi ;\
 		for m in $(MANUALS); do \
 			n=`echo "$$m" | sed 's/Documentation/Documentation\/'$$l'/'` ; \
@@ -78,6 +100,8 @@ website-xrefs: website-version
 				-I $(top-src-dir)/Documentation \
 				-I $(top-src-dir)/Documentation/"$$l" \
 				-I $(top-src-dir)/Documentation/"$$l"/"$$d" \
+				--known-missing-files=$(top-src-dir)/scripts/build/website-known-missing-files.txt \
+			  $(quiet-flag) \
 				-I $(OUT) -o $(OUT) "$$n" ; \
 			fi ; \
 		done; \
@@ -86,11 +110,15 @@ website-xrefs: website-version
 website-bibs: website-version
 	BSTINPUTS=$(top-src-dir)/Documentation/web \
 		$(WEB_BIBS) -s web \
+		-s $(top-src-dir)/Documentation/lily-bib \
 		-o $(OUT)/others-did.itexi \
+		$(quiet-flag) \
 		$(top-src-dir)/Documentation/web/others-did.bib
 	BSTINPUTS=$(top-src-dir)/Documentation/web \
 		$(WEB_BIBS) -s web \
+		-s $(top-src-dir)/Documentation/lily-bib \
 		-o $(OUT)/we-wrote.itexi \
+		$(quiet-flag) \
 		$(top-src-dir)/Documentation/web/we-wrote.bib
 
 
@@ -119,12 +147,18 @@ website-css:
 
 website-pictures:
 	mkdir -p $(OUT)/website/pictures
-	cp $(PICTURES)/* $(OUT)/website/pictures
-	ln -sf website/pictures $(OUT)/pictures
+	if [ -d $(PICTURES) ]; \
+	then \
+		cp $(PICTURES)/* $(OUT)/website/pictures ; \
+		ln -sf website/pictures $(OUT)/pictures  ;\
+	fi
 
 website-examples:
 	mkdir -p $(OUT)/website/ly-examples
-	cp $(EXAMPLES)/* $(OUT)/website/ly-examples
+	if [ -d $(EXAMPLES) ]; \
+	then \
+		cp $(EXAMPLES)/* $(OUT)/website/ly-examples ; \
+	fi
 
 web-post:
 	$(WEB_POST) $(OUT)/website