From 238d7665adfa22b31fd7a39a9b75d72dbb17d034 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Tue, 5 Mar 2002 18:10:28 +0000 Subject: [PATCH] Fixed tricky problem when copying resources from a subproject ... * being expanded to itself in the shell if no matching file exists! git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@13015 72102866-910b-0410-8b05-ffd578937521 --- Instance/Shared/bundle.make | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Instance/Shared/bundle.make b/Instance/Shared/bundle.make index 2e09b67c..8b99ff24 100644 --- a/Instance/Shared/bundle.make +++ b/Instance/Shared/bundle.make @@ -144,6 +144,11 @@ $(FULL_RESOURCE_DIRS): # TODO - implement the `Developer` mode :-) # +# Please note the trick when copying subproject resources - if there +# is nothing inside $$subproject/Resources/Subproject/, in +# $$subproject/Resources/Subproject/* the * expands to itself. So we +# check if that is true before trying to copy. + shared-instance-bundle-all: $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH) \ $(FULL_RESOURCE_DIRS) \ shared-instance-bundle-all-gsweb @@ -183,7 +188,10 @@ ifneq ($(_SUBPROJECTS),) @(echo "Copying resources from subprojects into the $(GNUSTEP_TYPE) wrapper..."; \ for subproject in $(_SUBPROJECTS); do \ if [ -d $$subproject/Resources/Subproject ]; then \ - cp -r $$subproject/Resources/Subproject/* $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/; \ + if [ "$$subproject/Resources/Subproject/*" != $$subproject'/Resources/Subproject/*' ]; then \ + cp -r $$subproject/Resources/Subproject/* \ + $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH)/; \ + fi; \ fi; \ done) endif