summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-12-08 18:47:39 +1100
committerAndrew Tridgell <tridge@samba.org>2010-12-08 12:01:25 +0100
commit92961d28281653906f58f01817cf58b02f85168c (patch)
treeae0754519eaf59b893627712710d80b2b798edd8
parent2079a6d110ae12f12497605a03deae6720434a6c (diff)
downloadsamba-92961d28281653906f58f01817cf58b02f85168c.tar.gz
samba-92961d28281653906f58f01817cf58b02f85168c.tar.bz2
samba-92961d28281653906f58f01817cf58b02f85168c.zip
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 <abartlet@samba.org>
-rw-r--r--buildtools/wafsamba/pkgconfig.py8
1 files changed, 6 insertions, 2 deletions
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