Toplevel dist: regenerate and include ChangeLog, RELEASE-COMMIT.

Fixes unstampedness of tarballs, which can make things especially
hairy for packagers/distributors when eg lilypond-2.12.2 is happens
to be released from MASTER instead of stable/2.12.

diff --git a/.gitignore b/.gitignore
index ab855da8448013a368123ba22accd41a73f5c411..5f51beb6fe33bef881115fe7075fe05331322bed 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -74,5 +74,6 @@ pats
 tags
 test-output-distance
 ChangeLog
+RELEASE-COMMIT
 Documentation/user/lilypond
 input/lsr/lilypond-snippets

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3c8385750bc557179d6ec843e56fec70098e7b82..d5480cf7b172056c7f2bb7ceb1a7befcaf768704 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -22,7 +22,8 @@ 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 \
+RELEASE_FILES = ChangeLog RELEASE-COMMIT
+EXTRA_DIST_FILES = $(RELEASE_FILES) VERSION .gitignore lilypond-texi2html.init \
   $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -35,7 +36,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
 
@@ -44,7 +45,16 @@ $(outdir)/VERSION: $(config_make) VERSION
        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
+       @echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > $@
+
+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:
+       rm -f ChangeLog
+       test -d $(top-src-dir)/.git && rm -f RELEASE-COMMIT
+       $(MAKE) $(RELEASE_FILES)
 
 python-modules:
        $(MAKE) -C python