Reverted part of last change

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@16646 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2003-05-06 10:29:16 +00:00
parent 4fcf8417da
commit a9052fa2d2
2 changed files with 19 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Tue May 6 11:30:19 2003 Nicola Pero <n.pero@mi.flashnet.it>
* Instance/Shared/bundle.make (shared-instance-bundle-all):
Reverted last change for resource files, but not localized
resource files.
Mon May 5 00:52:20 2003 Nicola Pero <n.pero@mi.flashnet.it>
* Instance/Shared/bundle.make (shared-instance-bundle-all): Fixed

View file

@ -182,13 +182,25 @@ $(FULL_RESOURCE_DIRS):
# $$subproject/Resources/Subproject/* the * expands to itself. So we
# check if that is true before trying to copy.
# Please note that if xxx/yyy is specified in RESOURCE_FILES, we
# create the file {bundle}/yyy (not {bundle}/xxx/yyy), because people
# usually can put resource files in subdirs, and want to copy them
# just top-level. That is what currently happens, but often enough
# you might want the other behaviour ({bundle}/xxx/yyy to be created),
# and TODO: devise a way to support it.
#
# If instead xxx/yyy is specified in LOCALIZED_RESOURCE_FILES, we
# create the file {bundle}/Language.lproj/xxx/yyy, because we want to
# mirror the Language.lproj directory faithfully. There is no
# possible confusion here.
shared-instance-bundle-all: $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH) \
$(FULL_RESOURCE_DIRS) \
shared-instance-bundle-all-gsweb
ifneq ($(RESOURCE_FILES),)
$(ECHO_COPYING_RESOURCES)for f in $(RESOURCE_FILES); do \
if [ -f $$f -o -d $$f ]; then \
cp -r $$f $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$$f; \
cp -r $$f $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/; \
else \
echo "Warning: $$f not found - ignoring"; \
fi; \