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

Fix build of multiple bundles in one dir

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8464 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2001-01-03 05:28:07 +00:00
parent 5d7322c7f6
commit 4080160e36
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2001-01-02 Adam Fedor <fedor@gnu.org>
* bundle.make (BUNDLE_FILE): Use INTERNAL_bundle_NAME.
($(BUNDLE_DIR_NAME)/Contents/Info.plist): Likewise.
($(BUNDLE_DIR_NAME)/Resources/Info.plist): Likewise.
(Fixes building of multiple bundles in one directory).
2000-01-02 Mirko Viviani <mirko.viviani@rccr.cremona.it>
* target.make (SHARED_LIB_LINK_CMD, SHARED_FRAMEWORK_LINK_CMD): removed

6
bundle.make
View file

@ -107,7 +107,7 @@ after-$(TARGET)-all::
BUNDLE_DIR_NAME := $(INTERNAL_bundle_NAME:=$(BUNDLE_EXTENSION))
BUNDLE_FILE := \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(BUNDLE_NAME)$(BUNDLE_OBJ_EXT)
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(INTERNAL_bundle_NAME)$(BUNDLE_OBJ_EXT)
BUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(BUNDLE_DIR_NAME)/Resources/$(d))
ifeq ($(strip $(RESOURCE_FILES)),)
override RESOURCE_FILES=""
@ -192,7 +192,7 @@ $(BUNDLE_DIR_NAME)/Contents/Info.plist: $(BUNDLE_DIR_NAME)/Contents
echo "<plist version='0.9'>";\
echo " <dict>";\
echo " <key>CFBundleExecutable</key>";\
echo " <string>$(GNUSTEP_TARGET_LDIR)/$(BUNDLE_NAME)${BUNDLE_OBJ_EXT}</string>";\
echo " <string>$(GNUSTEP_TARGET_LDIR)/$(INTERNAL_bundle_NAME)${BUNDLE_OBJ_EXT}</string>";\
echo " <key>CFBundleInfoDictionaryVersion</key>";\
echo " <string>6.0</string>";\
echo " <key>CFBundlePackageType</key>";\
@ -210,7 +210,7 @@ build-macosx-bundle :: $(BUNDLE_DIR_NAME)/Contents \
# NeXTstep bundles
$(BUNDLE_DIR_NAME)/Resources/Info.plist: $(BUNDLE_DIR_NAME)/Resources
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_TARGET_LDIR)/$(BUNDLE_NAME)${BUNDLE_OBJ_EXT}\";"; \
echo " NSExecutable = \"$(GNUSTEP_TARGET_LDIR)/$(INTERNAL_bundle_NAME)${BUNDLE_OBJ_EXT}\";"; \
if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
echo " NSMainNibFile = \"\";"; \
else \