Fix 790.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8e379eb6cd7312470f894dc6e98a3ec491bf17a3..8e56947fe76fba842e721e37334cff04501555db 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,7 +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
+README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING \
+  COPYING.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)
@@ -25,7 +26,7 @@ IN_FILES := $(call src-wildcard,*.in)
 RELEASE_FILES = ChangeLog RELEASE-COMMIT
 RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
 OUT_DIST_FILES += $(RELEASE_OUT_FILES)
-EXTRA_DIST_FILES = VERSION .gitignore lilypond-texi2html.init \
+EXTRA_DIST_FILES = VERSION .gitignore .mailmap \
   $(README_FILES) $(SCRIPTS) $(IN_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -101,6 +102,7 @@ ifeq ($(out),www)
 install-WWW:
        -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
        rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+       $(MAKE) -C Documentation omf-local-install
 
 install-info-WWW:
        $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) install-info && ) true
@@ -108,8 +110,7 @@ install-info-WWW:
 uninstall-WWW:
        rm -rf $(DESTDIR)$(webdir)
        -rmdir $(package_docdir)
-       $(MAKE) -C Documentation/user uninstall
-       $(MAKE) -C input/lsr uninstall
+       $(MAKE) -C Documentation uninstall
 
 
 # For online docs with content negotiation, issue `make doc WEB_TARGETS=online'
@@ -123,8 +124,12 @@ WWW-post:
        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
-endif
+endif # ifeq ($(out),www)
 
+# For those who cannot for the life in them remember to type
+# WEB_TARGETS=..., just bloody make all doc stuff, already.
+all-doc:
+       $(MAKE) WEB_TARGETS='online offline' doc
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
@@ -234,6 +239,14 @@ grand-replace:
        $(MAKE) -C scripts/build
        PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace
 
+
+################################################################
+# website (without the rest of the docs)
+web-gop:
+       touch Documentation/general.texi
+       cd Documentation && make out=www out-www/general/index.html
+
+
 ################################################################
 # testing