From e47b3760dc0bd235b537c2ba447453b35032f272 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Thu, 28 Jun 2012 18:18:09 +0000 Subject: Setup GIO_EXTRA_MODULES to look at the system path This makes dconf work. --- (limited to 'scripts') diff --git a/scripts/jhbuildrc b/scripts/jhbuildrc index 2e4e84f..2e8aab4 100644 --- a/scripts/jhbuildrc +++ b/scripts/jhbuildrc @@ -3,11 +3,16 @@ import os def root(): return os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -def libdir(): +def libdir(system=False): + if system: + base = "/usr" + else: + base = prefix + if use_lib64: - return os.path.join(prefix, "lib64") + return os.path.join(base, "lib64") else: - return os.path.join(prefix, "lib") + return os.path.join(base, "lib") interact = not "SUGAR_BUILDBOT" in os.environ @@ -22,4 +27,5 @@ prefix = os.path.join(root(), "install") os.environ["GTK_DATA_PREFIX"] = prefix os.environ["GTK_PATH"] = os.path.join(libdir(), "gtk-2.0") - +os.environ["GIO_EXTRA_MODULES"] = os.path.join(libdir(system=True), + "gio", "modules") -- cgit v0.9.1