simplify local-WWW-post.

diff --git a/ChangeLog b/ChangeLog
index a76372a0e5c9d65458f86de5054bcc9c4e1169f2..6f5727dbaf5bd70153a0322a13a9738483b4b6ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-31  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * GNUmakefile.in: simplify local-WWW-post. 
+
        * buildscripts/output-distance.py (ComparisonData.compare_trees):
        fixes. Don't follow symlinks.
        (ComparisonData.create_html_result_page): remove previous results.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3a7d3a80e812c70d5cc890d61c5a21245cc2ad43..2617397199e5215c59e0c9f060c80f5d778eedb6 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -73,24 +73,17 @@ local-WWW-post:
 
        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 -  
-       for dir in $(outdir)/web-root/ ; do  \
-               cd $$dir && \
-               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' -or -type l`; do \
+               (mkdir -p $(outdir)/web-root/$$d/ || true) ; \
+               rsync -a $(foreach pat,$(web-ext), --include '*'.$(pat)) $(top-build-dir)/$$d/ $(outdir)/web-root/$$d/../ ; \
        done
-       echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION
+## 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