gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-06-01 09:42:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed tricky problem when copying resources from a subproject ... * being

Browse source 
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
This commit is contained in:
Nicola Pero 2002-03-05 18:10:28 +00:00
parent ce085f7c20
commit 238d7665ad
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Instance/Shared/bundle.make
View file

@ -144,6 +144,11 @@ $(FULL_RESOURCE_DIRS):
# TODO - implement the `Developer` mode :-) # 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) \ shared-instance-bundle-all: $(GNUSTEP_SHARED_INSTANCE_BUNDLE_RESOURCE_PATH) \
$(FULL_RESOURCE_DIRS) \ $(FULL_RESOURCE_DIRS) \
shared-instance-bundle-all-gsweb shared-instance-bundle-all-gsweb
@ -183,7 +188,10 @@ ifneq ($(_SUBPROJECTS),)
@(echo "Copying resources from subprojects into the $(GNUSTEP_TYPE) wrapper..."; \ @(echo "Copying resources from subprojects into the $(GNUSTEP_TYPE) wrapper..."; \
for subproject in $(_SUBPROJECTS); do \ for subproject in $(_SUBPROJECTS); do \
if [ -d $$subproject/Resources/Subproject ]; then \ 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; \ fi; \
done) done)
endif endif