Oops^2: use $$ instead of $ in embeded makefile shell. Fixes funny fix.

[lilypond.git] / make / website.make

diff --git a/make/website.make b/make/website.make
index 02e6b198d07d1741dedfaf7cafec357c8b3a6905..34d70eb256abbcaaec8f20a22b61a7219bb5580d 100644 (file)
--- a/make/website.make
+++ b/make/website.make
@@ -60,20 +60,7 @@ website-version:
        $(CREATE_WEBLINKS) $(top-src-dir) > $(OUT)/weblinks.itexi
 
 website-xrefs: website-version
-       $(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
-               -I $(OUT) -o $(OUT) --split=node \
-               $(top-src-dir)/Documentation/web.texi
-       # normal manuals
-       for m in $(MANUALS); do \
-               b=`basename "$$m" .texi`; \
-               d=`basename "$$b" .tely`; \
-               $(EXTRACT_TEXI_FILENAMES) \
-                       -I $(top-src-dir)/Documentation/ \
-                       -I $(top-src-dir)/Documentation/"$$d"/ \
-                       -I $(OUT) -o $(OUT) "$$m" ; \
-       done
-       # translations
-       for l in $(WEB_LANGS); do \
+       for l in '' $(WEB_LANGS); do \
                $(EXTRACT_TEXI_FILENAMES) \
                        -I $(top-src-dir)/Documentation/ \
                        -I $(top-src-dir)/Documentation/"$$l" \
@@ -96,27 +83,22 @@ website-xrefs: website-version
 
 
 website-texinfo: website-version website-xrefs
-       $(TEXI2HTML) --prefix=index \
-               --split=section \
-               --I=$(top-src-dir)/Documentation/ \
-               --I=$(OUT) \
-               --init-file=$(texi2html-init-file) \
-               -D web_version \
-               --output=$(OUT)/website/ \
-               $(top-src-dir)/Documentation/web.texi
-       # translations
-       for l in $(WEB_LANGS); do \
+       for l in '' $(WEB_LANGS); do \
+               if test -n "$$l"; then \
+                       langopt=--lang="$$l"; \
+                       langsuf=.$$l; \
+               fi; \
                $(TEXI2HTML) --prefix=index \
                        --split=section \
                        --I=$(top-src-dir)/Documentation/"$$l" \
                        --I=$(top-src-dir)/Documentation/ \
                        --I=$(OUT) \
-                       --lang="$$l" \
+                       $$langopt \
                        --init-file=$(texi2html-init-file) \
                        -D web_version \
                        --output=$(OUT)/"$$l" \
                        $(top-src-dir)/Documentation/"$$l"/web.texi ; \
-               find $(OUT)/$$l/ -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(OUT)/'$$l'/!!g' | xargs $(MASS_LINK) --prepend-suffix .$$l hard $(OUT)/$$l/ $(OUT)/website/ ; \
+               find $(OUT)/$$l/ -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(OUT)/'$$l'/!!g' | xargs $(MASS_LINK) --prepend-suffix="$$langsuf" hard $(OUT)/$$l/ $(OUT)/website/ ; \
        done