gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-22 22:00:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct resource installation.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2908 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1998-08-04 21:28:27 +00:00
parent 51b6a01e80
commit 6c1d3f9957
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,6 +1,12 @@
Tue Aug 4 16:43:55 1998 Adam Fedor <fedor@doc.com>
* application.make: Correct resource installation when
RESOURCE_FILES not defined.
* bunlde.make: Likewise.
Tue Aug 4 12:50:00 1998 Richard Frith-Macdonald <richard@brainstrom.co.uk>
*brain.make: use -ldps even with xraw library.
* brain.make: use -ldps even with xraw library.
Tues Aug 4 1998 Felipe A. Rodriguez <far@ix.netcom.com>

5
application.make
View file

@ -81,6 +81,9 @@ ALL_GUI_LIBS := \
# rules.make).
APP_DIR_NAME = $(INTERNAL_app_NAME:=.$(APP_EXTENSION))
APP_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(APP_DIR_NAME)/Resources/$(d))
ifeq ($(strip $(RESOURCE_FILES)),)
override RESOURCE_FILES=none
endif
# Support building NeXT applications
ifneq ($(OBJC_COMPILER), NeXT)
@ -146,7 +149,7 @@ app-resource-dir::
$(APP_RESOURCE_DIRS)
app-resource-files:: $(APP_DIR_NAME)/Resources/Info-gnustep.plist app-resource-dir
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
@(if [ "$(RESOURCE_FILES)" != "none" ]; then \
echo "Copying resources into the application wrapper..."; \
for f in $(RESOURCE_FILES); do \
cp -r $$f $(APP_DIR_NAME)/Resources/$$f; \

5
bundle.make
View file

@ -80,6 +80,9 @@ BUNDLE_DIR_NAME := $(INTERNAL_bundle_NAME:=$(BUNDLE_EXTENSION))
BUNDLE_FILE := \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(BUNDLE_NAME)
BUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(BUNDLE_DIR_NAME)/Resources/$(d))
ifeq ($(strip $(RESOURCE_FILES)),)
override RESOURCE_FILES=none
endif
build-bundle-dir::
@$(GNUSTEP_MAKEFILES)/mkinstalldirs \
@ -96,7 +99,7 @@ $(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
$(ALL_LIB_DIRS) $(ALL_BUNDLE_LIBS)
bundle-resource-files:: $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
@(if [ "$(RESOURCE_FILES)" != "none" ]; then \
echo "Copying resources into the bundle wrapper..."; \
for f in $(RESOURCE_FILES); do \
cp -r $$f $(BUNDLE_DIR_NAME)/Resources/$$f; \