Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide for PREFIX to be set to the bundle when the platform is darwin. Backport of r17347

Browse Source 
svn: r17348
This commit is contained in:
John Ralls
2011-04-29 21:57:49 +00:00
parent 6acd0f0325
commit 95850b276d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mac/rungramps.py
View File

@@ -18,6 +18,7 @@ sys.path = [_gramps_path,
_site_lib_path, _site_lib_path,
_pylib_path] _pylib_path]
sys.prefix = _res_path
os.environ["GTK_PATH"] = _res_path os.environ["GTK_PATH"] = _res_path
os.environ["GTK2_RC_FILES"] = os.path.join(_gtk2_conf, "gtkrc") os.environ["GTK2_RC_FILES"] = os.path.join(_gtk2_conf, "gtkrc")
os.environ["GTK_IM_MODULE_FILE"]= os.path.join(_gtk2_conf, "immodules") os.environ["GTK_IM_MODULE_FILE"]= os.path.join(_gtk2_conf, "immodules")
@@ -125,7 +126,7 @@ else:
LC_ALL = _language LC_ALL = _language
os.environ["LC_ALL"] = LC_ALL #Spell-checker dictionary support os.environ["LC_ALL"] = LC_ALL #Spell-checker dictionary support
print LANG, LC_ALL
#LaunchServices sticks this argument on the front of argument #LaunchServices sticks this argument on the front of argument
#lists. It must make sense to somebody, but Gramps isn't that #lists. It must make sense to somebody, but Gramps isn't that
#somebody. #somebody.

3
src/const.py.in
View File

@@ -84,6 +84,9 @@ if sys.platform == "win32":
if sys.prefix == os.path.dirname(os.getcwd()): if sys.prefix == os.path.dirname(os.getcwd()):
PREFIXDIR = sys.prefix PREFIXDIR = sys.prefix
SYSCONFDIR = os.path.join(sys.prefix, "etc") 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: else:
PREFIXDIR = "@prefix@" PREFIXDIR = "@prefix@"
SYSCONFDIR = "@sysconfdir@" SYSCONFDIR = "@sysconfdir@"