Provide for PREFIX to be set to the bundle when the platform is darwin. Bundle is detected by differing sys.prefix and sys.exec_prefix, indicating that sys.prefix has been changed (which it is, in rungramps.py).
svn: r17347
This commit is contained in:
parent
8a2dd3d050
commit
eb7b9fa565
@ -18,6 +18,7 @@ sys.path = [_gramps_path,
|
||||
_site_lib_path,
|
||||
_pylib_path]
|
||||
|
||||
sys.prefix = _res_path
|
||||
os.environ["GTK_PATH"] = _res_path
|
||||
os.environ["GTK2_RC_FILES"] = os.path.join(_gtk2_conf, "gtkrc")
|
||||
os.environ["GTK_IM_MODULE_FILE"]= os.path.join(_gtk2_conf, "immodules")
|
||||
@ -125,7 +126,7 @@ else:
|
||||
LC_ALL = _language
|
||||
|
||||
os.environ["LC_ALL"] = LC_ALL #Spell-checker dictionary support
|
||||
print LANG, LC_ALL
|
||||
|
||||
#LaunchServices sticks this argument on the front of argument
|
||||
#lists. It must make sense to somebody, but Gramps isn't that
|
||||
#somebody.
|
||||
|
@ -80,10 +80,13 @@ APP_VCARD = ["text/x-vcard", "text/x-vcalendar"]
|
||||
# system paths
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
if sys.platform == "win32" or sys.platform == "darwin":
|
||||
if sys.platform == "win32":
|
||||
if sys.prefix == os.path.dirname(os.getcwd()):
|
||||
PREFIXDIR = sys.prefix
|
||||
SYSCONFDIR = os.path.join(sys.prefix, "etc")
|
||||
elif sys.platform == "darwin" and sys.prefix != sys.exec_prefix:
|
||||
PREFIXDIR = sys.prefix
|
||||
SYSCONFDIR = os.path.join(sys.prefix, "etc")
|
||||
else:
|
||||
PREFIXDIR = "@prefix@"
|
||||
SYSCONFDIR = "@sysconfdir@"
|
||||
|
Loading…
Reference in New Issue
Block a user