[gimp-help-2] [make] Resolve brace expansion in shell commands

[Ulf-D. Ehlert <ulfehlert src gnome org>]

commit 35c055bd708a98925e399b13da614324d7d33c08
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Wed Feb 17 20:00:01 2010 +0100

    [make] Resolve brace expansion in shell commands
    
    Brace expansion is not compatible with historical versions of sh and
    may lead to errors on systems where bash is not the default shell.

 Makefile.GNU |    8 ++++----
 Makefile.am  |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.GNU b/Makefile.GNU
index 31b5123..2d61499 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -520,13 +520,13 @@ xml-en: xml/en cleanup-xml-en ;
 
 ifeq ($(MAKE_IMAGES), lazy)
 # fast and lazy: detect added or removed images, but may miss changed images
-IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/{common,C} -type d)
+IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/common images/C -type d)
 else ifeq ($(MAKE_IMAGES), force)
 # just in case: always update images
 IMAGE_PREREQ = FORCE
 else
 # strict (default): detects added, removed, or changed images
-IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/{common,C})
+IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/common images/C)
 endif
 
 ifeq ($(CYGWIN),1)
@@ -536,7 +536,7 @@ xml/%/images: $(IMAGE_PREREQ)
 	$(cmd) test -d $@ && rm -rf $@/* || $(mkdir_p) $@
 	$(cmd) $(echo_n) "Copying images ($*) ..."
 	$(cmd) perl tools/make_image_links.pl -v $(MAKE_IMAGE_LINKS_FLAGS) \
-	                images/{common,C} xml/$*
+	                images/common images/C xml/$*
 	$(cmd) touch $@
 
 # Remove left over xml files
@@ -644,7 +644,7 @@ html/%/images: $(IMAGE_PREREQ)
 	$(cmd) test -d $@ && rm -rf $@/* || $(mkdir_p) $@
 	$(cmd) $(echo_n) "Copying HTML images ($*) ..."
 	$(cmd) perl tools/make_image_links.pl -v --mode=hardlink,copy \
-	                images/{common,C} $@
+	                images/common images/C $@
 	$(cmd) touch $@
 endif
 
diff --git a/Makefile.am b/Makefile.am
index 755220d..6574ee2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -576,13 +576,13 @@ xml-en: xml/en cleanup-xml-en ;
 
 # HIDE FROM AUTOMAKE #ifeq ($(MAKE_IMAGES), lazy)
 # HIDE FROM AUTOMAKE ## fast and lazy: detect added or removed images, but may miss changed images
-# HIDE FROM AUTOMAKE #IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/{common,C} -type d)
+# HIDE FROM AUTOMAKE #IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/common images/C -type d)
 # HIDE FROM AUTOMAKE #else ifeq ($(MAKE_IMAGES), force)
 # HIDE FROM AUTOMAKE ## just in case: always update images
 # HIDE FROM AUTOMAKE #IMAGE_PREREQ = FORCE
 # HIDE FROM AUTOMAKE #else
 # HIDE FROM AUTOMAKE ## strict (default): detects added, removed, or changed images
-# HIDE FROM AUTOMAKE #IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/{common,C})
+# HIDE FROM AUTOMAKE #IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/common images/C)
 # HIDE FROM AUTOMAKE #endif
 
 xml/%/images: $(IMAGE_PREREQ)
@@ -595,10 +595,10 @@ if CYGWIN
 # Cygwin
 	$(cmd) perl $(srcdir)/tools/make_image_links.pl -v \
 	           --mode=hardlink,copy \
-	           $(srcdir)/images/{common,C} $@
+	           $(srcdir)/images/common $(srcdir)/images/C $@
 else
 	$(cmd) perl $(srcdir)/tools/make_image_links.pl -v \
-	           $(srcdir)/images/{common,C} $@
+	           $(srcdir)/images/common $(srcdir)/images/C $@
 endif
 	$(cmd) touch $@
 
@@ -708,7 +708,7 @@ html/%/images: $(IMAGE_PREREQ)
 	$(cmd) $(echo_n) "Copying HTML images ($*) ..."
 	$(cmd) perl $(srcdir)/tools/make_image_links.pl -v \
 	           --mode=hardlink,copy \
-	           $(srcdir)/images/{common,C} $@
+	           $(srcdir)/images/common $(srcdir)/images/C $@
 	$(cmd) touch $@
 else
 # Default (non-Cygwin)