From 04096fd5e733c9ac0471932dbcff8537524fe90f Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 29 Oct 2011 10:38:02 +0000 Subject: [PATCH] This should finally fix it, I hope. --- direct/src/p3d/Packager.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/direct/src/p3d/Packager.py b/direct/src/p3d/Packager.py index 6dfc91fb76..a79cd30845 100644 --- a/direct/src/p3d/Packager.py +++ b/direct/src/p3d/Packager.py @@ -1083,10 +1083,10 @@ class Packager: # Alter the dependencies to have a relative path rather than absolute for filename in framework_deps: loc = self.__locateFrameworkLibrary(filename) - print "DEBUG: loc", loc + if loc == file.filename: os.system('install_name_tool -id "%s" "%s"' % (os.path.basename(filename), file.filename.toOsSpecific())) - elif loc.toOsSpecific().startswith("/System/"): + elif "/System/" in loc.toOsSpecific(): # Let's keep references to system frameworks absolute os.system('install_name_tool -change "%s" "%s" "%s"' % (filename, loc.toOsSpecific(), file.filename.toOsSpecific())) else: @@ -1168,8 +1168,7 @@ class Packager: filename = f2 # Skip libraries and frameworks in system directory - if filename.toOsSpecific().startswith("/System/"): - print "DEBUG: excluding", filename + if "/System/" in filename.toOsSpecific(): continue newName = Filename(file.dependencyDir, filename.getBasename()) @@ -1188,8 +1187,6 @@ class Packager: if line[0] not in string.whitespace: continue line = line.strip() - if line.startswith('/System/'): - continue s = line.find(' (compatibility') if s != -1: line = line[:s]