From 33dca73f9e84b164423d8860ff6324fb842c3998 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 12 Jan 2010 18:15:51 +0000 Subject: [PATCH] fix fmod on 1.7.0 osx build --- makepanda/makepanda.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 32229fd9a1..e2806673cb 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -4874,8 +4874,8 @@ def MakeInstallerOSX(): for line in open(GetOutputDir()+"/tmp/otool-libs.txt", "r"): if len(line.strip()) > 0 and not line.strip().endswith(":"): libdep = line.strip().split(" ", 1)[0] - if "/" not in libdep: - oscmd("install_name_tool -change %s /Developer/Panda3D/lib/%s %s" % (libdep, libdep, libname), True) + if not libdep.startswith("/"): + oscmd("install_name_tool -change %s /Developer/Panda3D/lib/%s %s" % (libdep, os.path.basename(libdep), libname), True) # Scripts to configure this version of Panda3D (in environment.plist) oscmd("mkdir -p dstroot/scripts/base/") @@ -4920,8 +4920,8 @@ def MakeInstallerOSX(): for line in open(GetOutputDir()+"/tmp/otool-libs.txt", "r"): if len(line.strip()) > 0 and not line.strip().endswith(":"): libdep = line.strip().split(" ", 1)[0] - if "/" not in libdep: - oscmd("install_name_tool -change %s /Developer/Panda3D/lib/%s %s" % (libdep, libdep, binname), True) + if not libdep.startswith("/"): + oscmd("install_name_tool -change %s /Developer/Panda3D/lib/%s %s" % (libdep, os.path.basename(libdep), binname), True) if PkgSkip("PYTHON")==0: oscmd("mkdir -p dstroot/pythoncode/usr/bin")