From ec7501ea4fe7e7d2bbb94ef5353b8059be3ae0fb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 5 Nov 2010 00:20:16 +0100
Subject: wafsamba: Support expanding variables in LIBDIR/PRIVATELIBDIR
 variables.

---
 buildtools/wafsamba/samba_utils.py | 4 ++--
 1 file 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)
 
 
-- 
cgit