Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f6389fbe3f7a0b4aae02d30ec1b7afc911c6e41a..012a9e82f7f7d7cfc852730d43bec47d135fe2c3 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -22,7 +22,7 @@ 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)
 
-EXTRA_DIST_FILES = VERSION .gitignore SConstruct lilypond-texi2html.init \
+EXTRA_DIST_FILES = VERSION .gitignore lilypond-texi2html.init \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -43,7 +43,20 @@ $(outdir)/VERSION: $(config_make) VERSION
        -mkdir -p $(outdir)
        echo $(TOPLEVEL_VERSION) > $@
 
-dist-toplevel-txt-files:
+ChangeLog: $(outdir)/VERSION
+       @echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > ChangeLog
+
+python-modules:
+       $(MAKE) -C python
+
+do-top-doc: python-modules
+
+local-clean: local-clean-ChangeLog
+
+local-clean-ChangeLog:
+       rm -f ChangeLog
+
+dist-toplevel-txt-files: do-top-doc
        -mkdir -p $(distdir)
        ln $(TOPDOC_TXT_FILES) $(distdir)/
        ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/
@@ -59,12 +72,17 @@ install-help2man:
 # installed in non-recursing target from TOP-SRC-DIR
 install-WWW:
        -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
-       rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+       rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+
+install-info-WWW:
        $(MAKE) -C Documentation/user install-info
        $(MAKE) -C input/lsr install-info
+       (cd $(DESTDIR)$(infodir) && rm -f lilypond && ln -sf $$($(PYTHON) $(buildscript-dir)/relative $(DESTDIR)$(webdir)/Documentation/user) lilypond)
+       (cd $(DESTDIR)$(infodir) && rm -f lilypond-snippets && ln -sf $$($(PYTHON) $(buildscript-dir)/relative $(DESTDIR)$(webdir)/input/lsr) lilypond-snippets)
 
 web-install:
        $(MAKE) out=www install-WWW
+       $(MAKE) out=www install-info-WWW
 
 uninstall-WWW:
        rm -rf $(DESTDIR)$(webdir)