Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / GNUmakefile.in
diff --git a/GNUmakefile.in b/GNUmakefile.in

index 83d1c1621c4a56fb74b9e483a09a0b5861cdb8e5..3a7d3a80e812c70d5cc890d61c5a21245cc2ad43 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -72,18 +72,15 @@ local-WWW-post:
         echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(outdir)/index.html
  
         cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
-
+       cd $(top-build-dir) && find . -name \*.html~ -print | xargs rm -f
         cd $(top-build-dir) && find Documentation input \
                 $(web-ext:%=-path '*/out-www/*.%' -or) -type l \
                 > $(outdir)/weblist
         ls $(outdir)/*.html >> $(outdir)/weblist
  
-## urg: this is too hairy, should write a python script to do this.
-
  ## rewrite file names so we lose out-www
-       rm -rf $(outdir)/web-root/ 
-       mkdir $(outdir)/web-root/
-## urg slow.
+       rm -rf $(outdir)/web-root/
+       mkdir $(outdir)/web-root/  
         cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf-  -T- ) | \
                 tar -C $(outdir)/web-root/ -xf -  
         for dir in $(outdir)/web-root/ ; do  \
@@ -99,10 +96,8 @@ 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-share-prefix-current = $(tree-share)/lilypond/current
-tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
-tree-lib-prefix-current = $(tree-lib)/lilypond/current
+tree-share-prefix = $(tree-share)/lilypond/current
+tree-lib-prefix = $(tree-lib)/lilypond/current
  
  C_DIRS = flower lily
  c-clean:
@@ -127,9 +122,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
         cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
         mkdir -p $(tree-bin)
         mkdir -p $(tree-share-prefix)
-       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
@@ -184,16 +177,11 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
         -cd $(tree-share-prefix)/fonts/type1 && \
                 ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
  
+
  TAGS.make: dummy
         etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
  
-local-clean: build-dir-setup-clean local-web-clean
-
-local-web-clean:
-       rm -rf $(outdir)/web-root/
-
-
-
+local-clean: build-dir-setup-clean
  build-dir-setup-clean:
         cd $(top-build-dir) && rm -rf share