From 99cd1512ae71742b308c36587eb3efa40fce06d8 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Tue, 17 Oct 2006 10:35:38 +0200
Subject: [PATCH] Some cleanups

---
 .gitignore                  |  1 -
 configure.ac                |  1 -
 sugar/__installed__.py.in   |  2 --
 sugar/__uninstalled__.py    | 10 ++++++++++
 sugar/__uninstalled__.py.in | 16 ----------------
 5 files changed, 10 insertions(+), 20 deletions(-)
 create mode 100644 sugar/__uninstalled__.py
 delete mode 100644 sugar/__uninstalled__.py.in

diff --git a/.gitignore b/.gitignore
index 4941cd74..75980977 100644
--- a/.gitignore
+++ b/.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
diff --git a/configure.ac b/configure.ac
index a747ae56..c9f77472 100644
--- a/configure.ac
+++ b/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
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index a8b28c93..e844b84b 100644
--- a/sugar/__installed__.py.in
+++ b/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 = []
diff --git a/sugar/__uninstalled__.py b/sugar/__uninstalled__.py
new file mode 100644
index 00000000..69c2b802
--- /dev/null
+++ b/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')
diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in
deleted file mode 100644
index eeef3297..00000000
--- a/sugar/__uninstalled__.py.in
+++ /dev/null
@@ -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'))