Silences "Not a dir" messages in make website

[lilypond.git] / make / website.make

diff --git a/make/website.make b/make/website.make
index e05aa8ff9d9f770b34b9d2a9a77c949f4de54834..62ca4b803d71f74d40d5a68c1db593c7428f1903 100644 (file)
--- 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
@@ -64,10 +84,17 @@ website-version:
 
 website-xrefs: website-version
        for l in '' $(WEB_LANGS); do \
+               len="$${#l}" ; \
+               r="$$l"; \
+               if [ "$$len" -gt "0" ] ; then \
+                       r="$$r"/; \
+               fi ; \
                $(EXTRACT_TEXI_FILENAMES) \
                        -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'/'` ; \
@@ -77,7 +104,9 @@ website-xrefs: website-version
                                $(EXTRACT_TEXI_FILENAMES) \
                                -I $(top-src-dir)/Documentation \
                                -I $(top-src-dir)/Documentation/"$$l" \
-                               -I $(top-src-dir)/Documentation/"$$l"/"$$d" \
+                               -I $(top-src-dir)/Documentation/"$$r""$$d" \
+                               --known-missing-files=$(top-src-dir)/scripts/build/website-known-missing-files.txt \
+                         $(quiet-flag) \
                                -I $(OUT) -o $(OUT) "$$n" ; \
                        fi ; \
                done; \
@@ -88,11 +117,13 @@ website-bibs: website-version
                $(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