Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8e590cdb4e7b63710bcdfd2da575b2f7bb5188af..ca98bf838c0f646dbb5c4de565425cb223b7db6f 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -27,7 +27,7 @@ RELEASE_FILES = ChangeLog RELEASE-COMMIT
 RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
 OUT_DIST_FILES += $(RELEASE_OUT_FILES)
 EXTRA_DIST_FILES = VERSION .gitignore .mailmap \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES)
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) website.make
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -123,7 +123,7 @@ WWW-post:
        $(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/
        find $(outdir) -name '*-root' | xargs rm -rf
        $(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)"
-       find $(outdir)/offline-root -type l -delete
+       find $(outdir)/offline-root -type l | xargs rm -f
 endif # ifeq ($(out),www)
 
 # For those who cannot for the life in them remember to type
@@ -240,11 +240,6 @@ grand-replace:
        PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
 
-################################################################
-# website (without the rest of the docs)
-website:
-       $(MAKE) out=www -C Documentation website
-
 ################################################################
 # testing
 
@@ -293,3 +288,11 @@ snippets-clean:
 
 test-snippets-clean:
        rm -rf out/lybook-testdb
+
+# we want this separate for security; see CG 4.2.  -gp
+website:
+       $(MAKE) config_make=$(config_make) \
+               top-src-dir=$(top-src-dir) \
+               -f $(top-src-dir)/website.make \
+               website
+