]> git.donarmstrong.com Git - lilypond.git/commitdiff
Build: Use bash to properly handle {foo,bar} in wildcards.
authorJulien Rioux <jrioux@physics.utoronto.ca>
Thu, 19 Jan 2012 14:49:52 +0000 (09:49 -0500)
committerJulien Rioux <jrioux@physics.utoronto.ca>
Sun, 22 Jan 2012 19:19:36 +0000 (14:19 -0500)
Otherwise wildcards are not properly expanded and www offline-root
is never rebuilt.

GNUmakefile.in

index 45e5bf7311457cd98bd64cdbef15f3ff07b60d57..48d52af68fe0f94046b9599fa6973478105b5bfe 100644 (file)
@@ -122,11 +122,12 @@ WEB_EXAMPLE_FILES = $(wildcard input/$(outdir)/*.ly) \
                     $(wildcard input/*/$(outdir)/*.ly) \
                     $(wildcard input/*/*/$(outdir)/*.ly)
 
-WEB_TRACKED_FILES = $(wildcard $(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}) \
-                    $(wildcard input/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}) \
-                    $(wildcard input/*/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}) \
-                    $(wildcard Documentation/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}) \
-                    $(wildcard Documentation/$(outdir)/*/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php})
+WEB_TRACKED_FILES = $(filter-out $(outdir)/index.html, \
+                    $(shell bash -O nullglob -c "echo $(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")) \
+                    $(shell bash -O nullglob -c "echo input/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo input/*/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo Documentation/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \
+                    $(shell bash -O nullglob -c "echo Documentation/$(outdir)/*/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")
 
 WWW-post: $(top-build-dir)/.htaccess $(outdir)/examples.html $(outdir)/offline-root/index.html