Fix @{ @}.

[lilypond.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index e144e60bd2200beacb768798f99ba97bf5e900b9..e95d6ba99f2bfca2e260ff400a871c495186b93f 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -83,16 +83,16 @@ local-WWW-post:
                tar -C $(outdir)/web-root/ -xf -  
        cd $(outdir)/web-root/ &&  \
                for a in `find . -name out-www`; do \
-                       mv $$a/* $$a/.. ; \
-                       rmdir $$a ; \
+                       rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
+                       rm -rf $$a ; \
                done
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
 tree-lib = $(tree-prefix)/lib
 tree-share = $(tree-prefix)/share
-tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION)
-tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
+tree-share-prefix = $(tree-share)/lilypond/current
+tree-lib-prefix = $(tree-lib)/lilypond/current
 
 C_DIRS = flower lily
 c-clean:
@@ -118,8 +118,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
        mkdir -p $(tree-bin)
        mkdir -p $(tree-share-prefix)
        mkdir -p $(tree-lib-prefix)
-       (cd $(tree-lib)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current)
-       (cd $(tree-share)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current)
        mkdir -p $(tree-share-prefix)/dvips
        mkdir -p $(tree-share-prefix)/elisp
        mkdir -p $(tree-share-prefix)/fonts
@@ -176,6 +174,9 @@ $(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')
+
 local-clean: build-dir-setup-clean
 build-dir-setup-clean:
        cd $(top-build-dir) && rm -rf share