Web build: reduce the number of errors/warnings.

diff --git a/Documentation/included/helpus.itexi b/Documentation/included/helpus.itexi
index 8386924febcb7ad8bbbfb499739dea3340032587..e4d094593d435bd5f3a681b5cd07e0b4e02de4e7 100644 (file)
--- a/Documentation/included/helpus.itexi
+++ b/Documentation/included/helpus.itexi
@@ -52,7 +52,7 @@ development environment.  See @rcontrib{Starting with Git}.}
 @item
 Documentation: see
 @rcontrib{Documentation work}, and
-@rcontrib{Building documentation without compiling LilyPond}.
+@rcontrib{Building documentation without compiling}.
 
 @item
 Website: the website is built from the normal documentation

diff --git a/website.make b/website.make
index 465757862073fbb97a870d0bb0e585de2b816131..26efac9cebefb9882208a55869d79a17b7f46d8d 100644 (file)
--- a/website.make
+++ b/website.make
@@ -56,12 +56,19 @@ website-xrefs: website-version
        $(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
                -I $(OUT) -o $(OUT) --split=node \
                $(top-src-dir)/Documentation/web.texi
-       $(foreach manual, $(MANUALS), \
-               $(EXTRACT_TEXI_FILENAMES) -I $(top-src-dir)/Documentation/ \
-               -I $(OUT) -o $(OUT) $(manual) && ) :
+       # 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 \
                $(EXTRACT_TEXI_FILENAMES) \
+                       -I $(top-src-dir)/Documentation/ \
                        -I $(top-src-dir)/Documentation/"$$l" \
                        -I $(OUT) -o $(OUT) --split=node \
                        $(top-src-dir)/Documentation/"$$l"/web.texi ;\