From 930dbeff8f5d31faa9654365c8ed84a30e489e83 Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Thu, 19 Jan 2012 09:49:52 -0500 Subject: [PATCH] Build: Use bash to properly handle {foo,bar} in wildcards. Otherwise wildcards are not properly expanded and www offline-root is never rebuilt. --- GNUmakefile.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 -- 2.39.5