(top-web): Rewrite weblist find command.

diff --git a/ChangeLog b/ChangeLog
index 68db43c81a36fad4e4b4b9de805c538d1285700c..67448968f0c83a02993c0d05445c3c31538f222c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * GNUmakefile.in (short-examples):
        (long-examples): Bugfix for --srcdir build.
+       (top-web): Rewrite weblist find command.
 
        * stepmake/bin/config.sub: 
        * stepmake/bin/config.guess: Update from latest autotools.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 4137959534f98211ae5cdd1b32c7e3666258e999..6f9510cd8c517bb05092aa643d5e9be237e3c928 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -82,22 +82,14 @@ lily: lily/$(outdir)/lilypond
 lily/$(outdir)/lilypond:
        $(MAKE) -C lily
 
-local-web: web-doc $(TOP_HTMLS:%=%) footify do-top-doc top-web
+local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
+web-ext = gz html midi pdf png txt
 top-web:
        cd $(builddir) && rm -f `find . -name \*.html~ -print`
-       cd $(builddir) && find `find Documentation input mutopia -type d -name 'out-www' -print` \
-               -not -name '*.dvi' -not -name '*ly' -not -name '*.tex' \
-               -not -name '*.ps' -not -name '*.eps' -not -name '*pk' \
-               -not -name '*.aux' -not -name '*.cp' -not -name '*.fn' \
-               -not -name '*.vr' -not -name '*.yp' -not -name '*.ky' \
-               -not -name '*.pg' -not -name '*.tmp' -not -name '*.toc' \
-               -not -name '*.fns' -not -name '*.cps' -not -name '*.nexi' \
-               -not -name '*.texi' -not -name '*.texidoc' -not -name '*.tp' \
-               -not -name '*.pdfps' -not -name '*.eps.bbox' \
-               -not -name '*.log' -not -name 'out-www' -not -name '*.dep' \
-               -print \
-           > $(outdir)/weblist
+       cd $(builddir) && find Documentation input mutopia \
+               $(web-ext:%=-path '*/out-www/*.%' -or) -false \
+               > $(outdir)/weblist
        cd $(builddir) && ls *.png *.html >> $(outdir)/weblist
        cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)