Some cleanups

.gitignore

@@ -37,7 +37,6 @@ po/stamp-it
 po/sugar.pot
 po/*.gmo
 sugar/__installed__.py
-sugar/__uninstalled__.py
 tools/sugar-setup-activity
 services/presence/org.laptop.Presence.service
 threadframe

configure.ac

@@ -68,7 +68,6 @@ shell/view/frame/Makefile
 shell/model/Makefile
 sugar/Makefile
 sugar/__installed__.py
-sugar/__uninstalled__.py
 sugar/activity/Makefile
 sugar/chat/Makefile
 sugar/chat/sketchpad/Makefile

sugar/__installed__.py.in

@@ -4,5 +4,3 @@ 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_bin_path = []

sugar/__uninstalled__.py

@@ -0,0 +1,10 @@
+import os
+import tempfile
+
+_tmpdir = os.path.join(tempfile.gettempdir(), 'sugar')
+_sourcedir = os.path.dirname(os.path.dirname(__file__))
+
+sugar_data_dir = os.path.join(_sourcedir, 'shell/data')
+sugar_services_dir = os.path.join(_sourcedir, 'services')
+sugar_activity_info_dir = _tmpdir
+sugar_dbus_config = os.path.join(_sourcedir, 'dbus-uninstalled.conf')

sugar/__uninstalled__.py.in

@@ -1,16 +0,0 @@
-import os
-import tempfile
-
-sugar_source_dir = os.path.dirname(os.path.dirname(__file__))
-sugar_data_dir = os.path.join(sugar_source_dir, 'shell/data')
-sugar_services_dir = os.path.join(sugar_source_dir, 'services')
-
-__tmpdir = os.path.join(tempfile.gettempdir(), 'sugar')
-sugar_activity_info_dir = __tmpdir
-
-sugar_dbus_config = os.path.join(sugar_source_dir, 'dbus-uninstalled.conf')
-
-sugar_bin_path = []
-sugar_bin_path.append(os.path.join(sugar_source_dir))
-sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell'))
-sugar_bin_path.append(os.path.join(sugar_source_dir, 'services/presence'))