[gnome-shell] Use the use_lib64 jhbuild variable to pick the cor



commit 947303cc0bdb3416c5cf48a8087148a30a9bd2c5
Author: Colin Walters <walters verbum org>
Date:   Tue Mar 10 16:25:53 2009 -0400

    Use the use_lib64 jhbuild variable to pick the correct libdir
    
    Fixes multilib systems with 32 bit devel packages installed.
---
 tools/build/jhbuildrc-gnome-shell |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell
index 17cb8ea..ccee3d3 100644
--- a/tools/build/jhbuildrc-gnome-shell
+++ b/tools/build/jhbuildrc-gnome-shell
@@ -29,7 +29,11 @@ checkoutroot = os.path.expanduser('~/gnome-shell/source')
 prefix = os.path.expanduser('~/gnome-shell/install')
 
 # Use system libraries for the builds
-addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'lib', 'pkgconfig'))
+if use_lib64:
+    libdir = 'lib64'
+else:
+    libdir = 'lib'
+addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', libdir, 'pkgconfig'))
 addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
 
 # Look in /usr/share for icons, D-BUS service files, etc



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]