From: Julien Rioux <jrioux@physics.utoronto.ca>
Date: Thu, 19 Jan 2012 14:49:52 +0000 (-0500)
Subject: Build: Use bash to properly handle {foo,bar} in wildcards.
X-Git-Tag: release/2.15.27-1~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=930dbeff8f5d31faa9654365c8ed84a30e489e83;p=lilypond.git

Build: Use bash to properly handle {foo,bar} in wildcards.

Otherwise wildcards are not properly expanded and www offline-root
is never rebuilt.
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 45e5bf7311..48d52af68f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -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