Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 70d937a7f49ca34f28af22da2c7a0624c2b2d805..04a305ed7606a133494630f74dc6c34bedf7e026 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,7 +18,7 @@ documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh 
 README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
-TOPDOC_FILES=AUTHORS README INSTALL NEWS
+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)
 
@@ -35,10 +35,10 @@ include $(depth)/make/stepmake.make
 local-dist: dist-toplevel-txt-files dist-changelog
 
 dist-changelog:
-       if  test -d .git ; then \
-               git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
+       if  test -d $(top-src-dir)/.git ; then \
+               cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
        else \
-               cp $(srcdir)/ChangeLog $(distdir) ; \
+               cp $(top-src-dir)/ChangeLog $(distdir) ; \
        fi
 
 default: $(outdir)/VERSION
@@ -212,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