Thinko: dist .ihtml source files in doc directories

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 663e8556a97f180b7c98da8676c7d632c0198d8a..ca98bf838c0f646dbb5c4de565425cb223b7db6f 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,8 +17,8 @@ SUBDIRS = python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
-README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING \
-  COPYING.DOCUMENTATION
+README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP THANKS HACKING \
+  LICENSE LICENSE.DOCUMENTATION
 TOPDOC_FILES = AUTHORS INSTALL README NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.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,13 +240,6 @@ grand-replace:
        PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
 
-################################################################
-# website (without the rest of the docs)
-web-gop:
-       touch Documentation/web.texi
-       cd Documentation && make out=www out-www/web/index.html
-
-
 ################################################################
 # testing
 
@@ -295,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
+