Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2006-05-12 07:04:07 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2006-05-12 07:04:07 (GMT)
commit343761bd8c207249a4b041f3380865d822157c90 (patch)
treec79720907e65fe6ed2af6ca747b8b7862bf537ec
parenta55dc687bfed1f1c665d04dfcdd83978f4f0a403 (diff)
Fix running from installation
-rw-r--r--sugar/Makefile.am7
-rw-r--r--sugar/__installed__.py.in4
2 files changed, 7 insertions, 4 deletions
diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index 7293e3c..626a56b 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -1,10 +1,11 @@
-SUBDIRS = chat browser shell
+SUBDIRS = chat browser p2p shell
bin_SCRIPTS = sugar
sugardir = $(pythondir)/sugar
sugar_PYTHON = \
__init__.py \
- __installed__.py
+ __installed__.py \
+ env.py
-EXTRA_DIST = sugar
+EXTRA_DIST = sugar __uninstalled__.py
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 717669d..7e7352f 100644
--- a/sugar/__installed__.py.in
+++ b/sugar/__installed__.py.in
@@ -1,2 +1,4 @@
+import os
+
def internal_get_data_file(filename):
- return "@prefix@/share/sugar"
+ return os.path.join('@prefix@/share/sugar', filename)