From 92961d28281653906f58f01817cf58b02f85168c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 8 Dec 2010 18:47:39 +1100 Subject: waf: support @LIB_RPATH@ in pc files this will be used to get the needed -Wl,-rpath options into our pc files Pair-Programmed-With: Andrew Bartlett --- buildtools/wafsamba/pkgconfig.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'buildtools/wafsamba') diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py index 1a41c80e30..4abf8d67d4 100644 --- a/buildtools/wafsamba/pkgconfig.py +++ b/buildtools/wafsamba/pkgconfig.py @@ -54,10 +54,14 @@ def PKG_CONFIG_FILES(bld, pc_files, vnum=None): source=f+'.in', target=f) t.vars = [] - for v in [ 'PREFIX', 'EXEC_PREFIX' ]: - t.vars.append(t.env[v]) + if t.env.RPATH_ON_INSTALL: + t.env.LIB_RPATH = t.env.RPATH_ST % t.env.LIBDIR + else: + t.env.LIB_RPATH = '' if vnum: t.env.PACKAGE_VERSION = vnum + for v in [ 'PREFIX', 'EXEC_PREFIX', 'LIB_RPATH' ]: + t.vars.append(t.env[v]) bld.INSTALL_FILES(dest, f, flat=True, destname=base) Build.BuildContext.PKG_CONFIG_FILES = PKG_CONFIG_FILES -- cgit