* make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf

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

index 41a3842cc0ce509218892dc3df39a8d2a76f8893..13ba6a3dca0086a466f23fb5589ebb12fd34401e 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -57,7 +57,7 @@ local-install:
  final-install:
         @true
  
-web-ext = html midi pdf png txt ly
+web-ext = html midi pdf png txt ly signature
  
  footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
  footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
@@ -72,22 +72,21 @@ 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
  
  ## rewrite file names so we lose out-www
-       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 -  
-       cd $(outdir)/web-root/ &&  \
-               for a in `find . -name out-www`; do \
-                       rsync -a  --link-dest $$a/ $$a/ $$a/.. ; \
-                       rm -rf $$a ; \
-               done
+       -mv $(outdir)/web-root/ $(outdir)/old-web-root
+       for d in out-www `cd $(top-build-dir) && find Documentation input -name 'out-www' `; do \
+               echo $$d ; \
+               (mkdir -p $(outdir)/web-root/$$d/ || true) ; \
+               rsync -Wa --include source --include music-glossary \
+                       --include lilypond-internals  \
+                       --include lilypond \
+               $(foreach pat,$(web-ext), --include '*'.$(pat)) $(top-build-dir)/$$d/ $(outdir)/web-root/$$d/../ ; \
+       done
+## todo: use --link-dest
+#  --link-dest=$(outdir)/old-web-root/$$d
+       -rm -rf $(outdir)/old-web-root
+
  
  tree-prefix = $(outdir)
  tree-bin = $(tree-prefix)/bin
@@ -132,9 +131,8 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
         mkdir -p $(tree-share-prefix)/tex
         cd $(tree-bin) && \
                 ln -sf ../../lily/$(outconfbase)/lilypond . && \
-               ln -sf ../../scripts/$(outconfbase)/convert-ly . && \
-               ln -sf ../../scripts/$(outconfbase)/lilypond-book . && \
-               ln -sf ../../scripts/$(outconfbase)/*.ly .
+               for i in abc2ly convert-ly etf2ly lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \
+                       do ln -sf ../../scripts/$(outconfbase)/$$i . ; done
         cd $(tree-lib-prefix) && \
                 ln -s ../../../../python/$(outconfbase) python
         cd $(tree-share-prefix) && \
@@ -175,7 +173,6 @@ $(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')