X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=123684cabda18df890a7a287337cd8badbe8f51a;hb=82509dfbd88f9d4fac9681880720cf7bff1ff05a;hp=fec79a01d2f8fb2163a76769ed836d2b156c0b4b;hpb=2fd463683cab91b18c1d241bca208764867f1503;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index fec79a01d2..123684cabd 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -22,8 +22,11 @@ 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 lilypond-texi2html.init \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) 
+RELEASE_FILES = ChangeLog RELEASE-COMMIT
+RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%)
+OUT_DIST_FILES += $(RELEASE_OUT_FILES)
+EXTRA_DIST_FILES = VERSION .gitignore \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -35,7 +38,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond
 include $(depth)/make/stepmake.make
 
 
-local-dist: dist-toplevel-txt-files 
+local-dist: refresh-release-files dist-toplevel-txt-files 
 
 all: $(outdir)/VERSION
 
@@ -43,8 +46,16 @@ $(outdir)/VERSION: $(config_make) VERSION
 	-mkdir -p $(outdir)
 	echo $(TOPLEVEL_VERSION) > $@
 
-ChangeLog: $(outdir)/VERSION
-	@echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > ChangeLog
+$(outdir)/ChangeLog: $(outdir)/VERSION
+	@echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > $@
+
+$(outdir)/RELEASE-COMMIT: # FIXME: any file in $(top-src-dir)/.git/ we can depend on and be sure RELEASE-COMMIT is up to date?
+	git --git-dir=$(top-src-dir)/.git show HEAD | head -100 > $@
+
+# junk me as soon as RELEASE-COMMIT FIXME: has been addressed
+refresh-release-files:
+	test -d $(top-src-dir)/.git && rm -f $(RELEASE_OUT_FILES)
+	$(MAKE) $(RELEASE_OUT_FILES)
 
 python-modules:
 	$(MAKE) -C python
@@ -90,6 +101,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
@@ -97,12 +109,11 @@ 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 web WEB_TARGETS=online'
-# For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
+# For online docs with content negotiation, issue `make doc WEB_TARGETS=online'
+# For both online and offline docs, issue `make doc WEB_TARGETS="offline online"'
 WEB_TARGETS = offline
 
 WWW-post: