Merge pull request #910 from saxon-s/master

Fixed broken source tree run time paths (ticket #867)

bin/gourmet

@@ -8,7 +8,7 @@ import sys
 
 # The following line is modified at installation time by setup.py so it
 # points to the actual modules installation path.
-lib_dir = '../..'
+lib_dir = '.'
 
 if lib_dir not in sys.path:
     sys.path.insert(0, lib_dir)

gourmet/gglobals.py

@@ -51,7 +51,7 @@
 # note: this stuff must be kept in sync with changes in setup.py
 import settings
 uibase = os.path.join(settings.ui_base)
-lib_dir = os.path.join(settings.lib_dir,'gourmet')
+lib_dir = os.path.join(settings.lib_dir)
 
 # To have strings from .ui files (gtk.Builder) translated on all platforms,
 # we need the following module to enable localization on all platforms.

gourmet/settings.py

@@ -4,17 +4,17 @@
 # The following lines are modified at installation time by setup.py so they
 # point to the actual data files installation paths.
 
-lib_dir = os.path.join(os.path.dirname(__file__),'../gourmet')
-base_dir = os.path.join(os.path.dirname(__file__),'..')
-data_dir = os.path.join(base_dir, "data")
+base_dir = os.path.join(os.path.dirname(__file__), '..')
+lib_dir = os.path.join(base_dir, 'gourmet')
+data_dir = os.path.join(base_dir, 'data')
 ui_base = os.path.join(base_dir, 'ui')
-doc_base = os.path.join(base_dir, "gourmet")
-locale_base = os.path.join(base_dir, "build", "mo")
-plugin_base = os.path.join(base_dir, "build", "share", "gourmet")
+doc_base = os.path.join(base_dir)
+locale_base = os.path.join(base_dir, 'build', 'mo')
+plugin_base = os.path.join(base_dir, 'build', 'share', 'gourmet')
 
 # Apologies for the formatting -- something in the build process is
 # getting rid of indentations in this file which throws a syntax error
 # on install
-if getattr(sys, 'frozen', False): base_dir = os.path.dirname(sys.executable); data_dir = base_dir; ui_base = os.path.join(base_dir, 'ui'); doc_base = os.path.join(base_dir, 'doc');locale_base = os.path.join(base_dir, "locale"); plugin_base = os.path.join(base_dir)
+if getattr(sys, 'frozen', False): base_dir = os.path.dirname(sys.executable); data_dir = base_dir; ui_base = os.path.join(base_dir, 'ui'); doc_base = os.path.join(base_dir, 'doc'); locale_base = os.path.join(base_dir, 'locale'); plugin_base = os.path.join(base_dir)
 
-icon_base = os.path.join(data_dir, "icons")
+icon_base = os.path.join(data_dir, 'icons')