summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-05 00:20:16 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-05 02:06:05 +0000
commitec7501ea4fe7e7d2bbb94ef5353b8059be3ae0fb (patch)
tree6f70e2519345ba8f8e75751631cb05164521e9cb
parente84e8705a98f3525f680a3d7e35ad55ae5370f51 (diff)
downloadsamba-ec7501ea4fe7e7d2bbb94ef5353b8059be3ae0fb.tar.gz
samba-ec7501ea4fe7e7d2bbb94ef5353b8059be3ae0fb.tar.bz2
samba-ec7501ea4fe7e7d2bbb94ef5353b8059be3ae0fb.zip
wafsamba: Support expanding variables in LIBDIR/PRIVATELIBDIR variables.
-rw-r--r--buildtools/wafsamba/samba_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 95ad86e38e..b9c8eca1bb 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -68,9 +68,9 @@ def install_rpath(bld):
bld.env['RPATH'] = []
ret = set()
if bld.env.RPATH_ON_INSTALL:
- ret.add(bld.env.LIBDIR)
+ ret.add(bld.EXPAND_VARIABLES(bld.env.LIBDIR))
if bld.env.RPATH_ON_INSTALL_PRIVATE:
- ret.add(bld.env.PRIVATELIBDIR)
+ ret.add(bld.EXPAND_VARIABLES(bld.env.PRIVATELIBDIR))
return list(ret)