Fixup services path with the various installed/uninstalled 0.94/0.95 combinations. What a pain!
This commit is contained in:
@@ -3,5 +3,6 @@ sugar_data_dir = '@prefix@/share/sugar'
|
||||
sugar_activities_dir = '@prefix@/share/sugar/activities'
|
||||
sugar_activity_info_dir = '@prefix@/share/sugar/activities'
|
||||
sugar_services_dir = '@prefix@/share/sugar/services'
|
||||
sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
|
||||
sugar_dbus_config = None
|
||||
sugar_dbus_config_094 = '@prefix@/share/sugar/dbus-installed.conf'
|
||||
sugar_shell_bin_dir = '@prefix@/bin'
|
||||
|
||||
@@ -9,4 +9,5 @@ sugar_services_dir = os.path.join(_sourcedir, 'services')
|
||||
sugar_activity_info_dir = _tmpdir
|
||||
sugar_activities_dir = os.path.join(_sourcedir, 'activities')
|
||||
sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf')
|
||||
sugar_dbus_config_094 = os.path.join(_sourcedir, 'dbus-uninstalled-094.conf')
|
||||
sugar_shell_bin_dir = os.path.join(_sourcedir, 'shell')
|
||||
|
||||
@@ -54,6 +54,9 @@ def get_services_dir():
|
||||
def get_dbus_config():
|
||||
return sugar_dbus_config
|
||||
|
||||
def get_dbus_config_094():
|
||||
return sugar_dbus_config_094
|
||||
|
||||
def get_shell_bin_dir():
|
||||
return sugar_shell_bin_dir
|
||||
|
||||
|
||||
Reference in New Issue
Block a user