Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-06-16 11:13:10 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-06-16 11:13:10 (GMT)
commitd0c3a14f3c89a27026d542c3d9d419ba0933c933 (patch)
treeb7875111b9e02fdee4dc2eeefd13fef1a6d161db
parentbda8ea4e4ff5aea915b79d83b9ef89260c2a6522 (diff)
Use a function for libdir to have warnings
-rw-r--r--scripts/jhbuildrc9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/jhbuildrc b/scripts/jhbuildrc
index 8d04d7b..5ce10e1 100644
--- a/scripts/jhbuildrc
+++ b/scripts/jhbuildrc
@@ -3,6 +3,12 @@ import os
def root():
return os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+def libdir():
+ if use_lib64:
+ return os.path.join(prefix, "lib64")
+ else:
+ return os.path.join(prefix, "lib")
+
interact = not "SUGAR_BUILDBOT" in os.environ
use_local_modulesets = True
@@ -12,8 +18,7 @@ modules = ["meta-system", "meta-sugar"]
checkoutroot = os.path.join(root(), "source")
prefix = os.path.join(root(), "build")
-libdir = os.path.join(prefix, ["lib", "lib64"][use_lib64])
os.environ["GTK_DATA_PREFIX"] = prefix
-os.environ["GTK_PATH"] = os.path.join(libdir, "gtk-2.0")
+os.environ["GTK_PATH"] = os.path.join(libdir(), "gtk-2.0")