Let's call it BINDIR.

This commit is contained in:
jdolan 2013-09-11 18:39:43 -04:00
parent 87c191207b
commit 7fdfe2b096

View file

@ -4,10 +4,10 @@ BUILD = ../build
INSTALL = ../install INSTALL = ../install
TARGET = target TARGET = target
RESOURCES = $(TARGET)/GtkRadiant.app/Contents/Resources RESOURCES = $(TARGET)/GtkRadiant.app/Contents/Resources
BINDIR = $(RESOURCES)/install
CONFDIR = $(RESOURCES)/etc CONFDIR = $(RESOURCES)/etc
DATADIR = $(RESOURCES)/share DATADIR = $(RESOURCES)/share
LIBDIR = $(RESOURCES)/lib LIBDIR = $(RESOURCES)/lib
INSTDIR = $(RESOURCES)/install
PREFIX_SED_EXPR = 's:/opt/local:@executable_path/..:g' PREFIX_SED_EXPR = 's:/opt/local:@executable_path/..:g'
VERSION = 1.6.4 VERSION = 1.6.4
DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg
@ -57,11 +57,11 @@ bundle:
test -L build || ln -s $(BUILD) test -L build || ln -s $(BUILD)
dylibbundler -b \ dylibbundler -b \
-x $(INSTDIR)/radiant.bin \ -x $(BINDIR)/radiant.bin \
-x $(INSTDIR)/q3map2 \ -x $(BINDIR)/q3map2 \
-x $(INSTDIR)/q3map2_urt \ -x $(BINDIR)/q3map2_urt \
-x $(INSTDIR)/q3data \ -x $(BINDIR)/q3data \
`find $(INSTDIR)/modules -name "*.so" | xargs -I {} echo -x {}` \ `find $(BINDIR)/modules -name "*.so" | xargs -I {} echo -x {}` \
`find $(LIBDIR) -name "*.so" | xargs -I {} echo -x {}` \ `find $(LIBDIR) -name "*.so" | xargs -I {} echo -x {}` \
-d $(LIBDIR) -of -p @executable_path/../lib -d $(LIBDIR) -of -p @executable_path/../lib