diff --git a/mac/rungramps.py b/mac/rungramps.py index 2b98b3eb0..ac948eab4 100755 --- a/mac/rungramps.py +++ b/mac/rungramps.py @@ -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. diff --git a/src/const.py.in b/src/const.py.in index f8c67b41c..1f737f815 100644 --- a/src/const.py.in +++ b/src/const.py.in @@ -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@"