Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sjhbuild/config.py4
-rw-r--r--sugar.jhbuildrc1
2 files changed, 1 insertions, 4 deletions
diff --git a/sjhbuild/config.py b/sjhbuild/config.py
index 1b557c9..95105ad 100644
--- a/sjhbuild/config.py
+++ b/sjhbuild/config.py
@@ -33,10 +33,6 @@ class Config(jhbuild.config.Config):
self.skip.append(source)
def setup_env(self):
- # Hack to replace the default prefix
- if self.prefix == '/opt/gnome':
- self.prefix = os.path.join(self.base_dir, 'install')
-
#Hack to allow sugar-jhbuild to find its self again.
MY_PATH = os.getenv('PATH', 'Error')
diff --git a/sugar.jhbuildrc b/sugar.jhbuildrc
index ef8181d..dd68aff 100644
--- a/sugar.jhbuildrc
+++ b/sugar.jhbuildrc
@@ -1,4 +1,5 @@
use_local_modulesets = True
+prefix = os.path.join(os.path.dirname(__file__), 'install')
modulesets_dir = os.path.join(os.path.dirname(__file__), 'config/modulesets')
jhbuildbot_slaves_dir = os.path.join(os.path.dirname(__file__), 'sbuildbot')
jhbuildbot_mastercfg = os.path.join(os.path.dirname(__file__), 'sbuildbot', 'master.cfg')