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 f9e1be0cd58f2c03206a66b8feca429b6efc7ddd..b5af8926c5ff801caf2aa7169472514cc6de95d6 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.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
@@ -154,7 +154,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current)
        mkdir -p $(tree-lib-prefix)
        ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current)
-       mkdir -p $(tree-share-prefix)/dvips
        mkdir -p $(tree-share-prefix)/elisp
        mkdir -p $(tree-share-prefix)/fonts
        mkdir -p $(tree-share-prefix)/fonts/otf
@@ -177,9 +176,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
                ln -s ../../../../python/$(outconfbase) python && \
                ln -s $(top-src-dir)/scm && \
                ln -s $(top-src-dir)/scripts scripts
-       cd $(tree-share-prefix)/dvips && \
-               ln -s ./../../../mf/$(outconfbase) mf-out && \
-               ln -s $(top-src-dir)/ps
        cd $(tree-share-prefix)/tex && \
                ln -s $(top-src-dir)/tex source && \
                ln -s ../../../../../tex/$(outconfbase) tex-out && \
@@ -212,7 +208,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