If not building standalone then PYTHONHOME shoudl not be set.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-21 22:37:09 +00:00
parent 0290bdd203
commit ec5a3c3d14

View File

@@ -280,7 +280,7 @@ mainprogram = os.path.join(resdir, "%(mainprogram)s")
sys.argv.insert(1, mainprogram) sys.argv.insert(1, mainprogram)
os.environ["PYTHONPATH"] = resdir os.environ["PYTHONPATH"] = resdir
os.environ["PYTHONHOME"] = resdir %(pythonhome)s
os.environ["PYTHONEXECUTABLE"] = executable os.environ["PYTHONEXECUTABLE"] = executable
os.environ["DYLD_LIBRARY_PATH"] = libdir os.environ["DYLD_LIBRARY_PATH"] = libdir
os.execve(executable, sys.argv, os.environ) os.execve(executable, sys.argv, os.environ)
@@ -441,10 +441,12 @@ class AppBuilder(BundleBuilder):
# XXX we're screwed when the end user has deleted # XXX we're screwed when the end user has deleted
# /usr/bin/python # /usr/bin/python
hashbang = "/usr/bin/python" hashbang = "/usr/bin/python"
pythonhome = 'os.environ["PYTHONHOME"] = resdir'
else: else:
hashbang = sys.executable hashbang = sys.executable
while os.path.islink(hashbang): while os.path.islink(hashbang):
hashbang = os.readlink(hashbang) hashbang = os.readlink(hashbang)
pythonhome = ''
open(bootstrappath, "w").write(BOOTSTRAP_SCRIPT % locals()) open(bootstrappath, "w").write(BOOTSTRAP_SCRIPT % locals())
os.chmod(bootstrappath, 0775) os.chmod(bootstrappath, 0775)