From 947303cc0bdb3416c5cf48a8087148a30a9bd2c5 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 10 Mar 2009 16:25:53 -0400 Subject: [PATCH] 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 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell index 17cb8ea48..ccee3d354 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