From 83d9c4f5289731c8adda2110c875a067af7396d4 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 11 Oct 2015 20:11:30 +0200 Subject: [PATCH] Use /usr/local instead of /usr in Mac OS X installer, to work around El Capitan's System Integrity Protection --- makepanda/makepanda.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 8c28cc20cc..7758c4df44 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -6674,8 +6674,8 @@ def MakeInstallerOSX(): # Trailing newline is important, works around a bug in OSX WriteFile("dstroot/tools/etc/paths.d/Panda3D", "/Developer/Tools/Panda3D\n") - oscmd("mkdir -p dstroot/tools/usr/share/man/man1") - oscmd("cp doc/man/*.1 dstroot/tools/usr/share/man/man1/") + oscmd("mkdir -p dstroot/tools/usr/local/share/man/man1") + oscmd("cp doc/man/*.1 dstroot/tools/usr/local/share/man/man1/") for base in os.listdir(GetOutputDir()+"/bin"): binname = "dstroot/tools/Developer/Tools/Panda3D/" + base @@ -6693,13 +6693,13 @@ def MakeInstallerOSX(): if PkgSkip("PYTHON")==0: PV = SDK["PYTHONVERSION"].replace("python", "") - oscmd("mkdir -p dstroot/pythoncode/usr/bin") + oscmd("mkdir -p dstroot/pythoncode/usr/local/bin") oscmd("mkdir -p dstroot/pythoncode/Developer/Panda3D") oscmd("mkdir -p dstroot/pythoncode/Library/Python/%s/site-packages" % PV) WriteFile("dstroot/pythoncode/Library/Python/%s/site-packages/Panda3D.pth" % PV, "/Developer/Panda3D") oscmd("cp -R %s/pandac dstroot/pythoncode/Developer/Panda3D/pandac" % GetOutputDir()) oscmd("cp -R %s/direct dstroot/pythoncode/Developer/Panda3D/direct" % GetOutputDir()) - oscmd("ln -s %s dstroot/pythoncode/usr/bin/ppython" % SDK["PYTHONEXEC"]) + oscmd("ln -s %s dstroot/pythoncode/usr/local/bin/ppython" % SDK["PYTHONEXEC"]) if os.path.isdir(GetOutputDir()+"/Pmw"): oscmd("cp -R %s/Pmw dstroot/pythoncode/Developer/Panda3D/Pmw" % GetOutputDir()) compileall.compile_dir("dstroot/pythoncode/Developer/Panda3D/Pmw")