Use the use_lib64 jhbuild variable to pick the correct libdir

Fixes multilib systems with 32 bit devel packages installed.
This commit is contained in:
Colin Walters 2009-03-10 16:25:53 -04:00
parent 8aa56e373f
commit 947303cc0b

View File

@ -29,7 +29,11 @@ checkoutroot = os.path.expanduser('~/gnome-shell/source')
prefix = os.path.expanduser('~/gnome-shell/install') prefix = os.path.expanduser('~/gnome-shell/install')
# Use system libraries for the builds # 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')) addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
# Look in /usr/share for icons, D-BUS service files, etc # Look in /usr/share for icons, D-BUS service files, etc