Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
Diffstat (limited to 'sugar')
-rw-r--r--sugar/__installed__.py.in3
-rw-r--r--sugar/__uninstalled__.py.in2
-rw-r--r--sugar/env.py3
3 files changed, 6 insertions, 2 deletions
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 5ebed29..fd1b855 100644
--- a/sugar/__installed__.py.in
+++ b/sugar/__installed__.py.in
@@ -6,5 +6,6 @@ sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
sugar_python_path = ['@prefix@/share/sugar/shell',
'@prefix@/share/sugar/bindings',
- '@prefix@/share/sugar/activities']
+ '@prefix@/share/sugar/activities',
+ '@prefix@/share/sugar/services']
sugar_bin_path = []
diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in
index 860cb21..02b43f1 100644
--- a/sugar/__uninstalled__.py.in
+++ b/sugar/__uninstalled__.py.in
@@ -14,6 +14,8 @@ sugar_python_path = ['@prefix@/share/sugar/bindings']
sugar_python_path.append(sugar_source_dir)
sugar_python_path.append(os.path.join(sugar_source_dir, 'shell'))
sugar_python_path.append(os.path.join(sugar_source_dir, 'activities'))
+sugar_python_path.append(os.path.join(sugar_source_dir, 'services'))
sugar_bin_path = []
sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell'))
+sugar_bin_path.append(os.path.join(sugar_source_dir, 'services/presence'))
diff --git a/sugar/env.py b/sugar/env.py
index 8fc131a..b0c5443 100644
--- a/sugar/env.py
+++ b/sugar/env.py
@@ -43,7 +43,8 @@ def setup_system():
runner = os.path.join(sugar_source_dir, 'shell/sugar-activity-factory')
sugar.setup.setup_activities(source, sugar_activities_dir, runner)
- bin = os.path.join(sugar_source_dir, 'shell/sugar-presence-service')
+ bin = os.path.join(sugar_source_dir,
+ 'services/presence/sugar-presence-service')
sugar.setup.write_service('org.laptop.Presence', bin,
sugar_activities_dir)