X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=04a305ed7606a133494630f74dc6c34bedf7e026;hb=2ca751172a1dad09061c54d9a10fee7663d12a51;hp=ffab58bd76996ba55cfdb697aac0430e9086b6c3;hpb=92eb74ab4fe81b4d94f068bc21bf63c988cc0a69;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ffab58bd76..04a305ed76 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,7 +9,7 @@ SUBDIRS = buildscripts python scripts \
 	po make \
 	elisp vim \
 	input \
-	cygwin stepmake $(documentation-dir)
+	stepmake $(documentation-dir)
 
 
 ## this convoluted construction is necessary, since we don't know the
@@ -17,14 +17,13 @@ SUBDIRS = buildscripts python scripts \
 documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh 
-README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING
-TOPDOC_FILES=AUTHORS README INSTALL NEWS
+README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
+TOPDOC_FILES = AUTHORS README INSTALL NEWS
 TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES)))
 IN_FILES := $(call src-wildcard,*.in)
 
-PATCH_FILES = emacsclient.patch server.el.patch 
-EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
-  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
+EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) 
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
 
@@ -33,7 +32,19 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
-local-dist: dist-toplevel-txt-files
+local-dist: dist-toplevel-txt-files dist-changelog
+
+dist-changelog:
+	if  test -d $(top-src-dir)/.git ; then \
+		cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
+	else \
+		cp $(top-src-dir)/ChangeLog $(distdir) ; \
+	fi
+
+default: $(outdir)/VERSION
+
+$(outdir)/VERSION: $(config_make)
+	echo $(TOPLEVEL_VERSION) > $@
 
 dist-toplevel-txt-files:
 	-mkdir -p $(distdir)
@@ -201,7 +212,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 		ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
 
 TAGS.make: dummy
-	etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
+	etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
 
 local-clean: build-dir-setup-clean local-web-clean