From e84e8705a98f3525f680a3d7e35ad55ae5370f51 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 5 Nov 2010 00:03:20 +0100
Subject: Add --disable-rpath-private-install flag.

---
 buildtools/wafsamba/samba_utils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'buildtools/wafsamba/samba_utils.py')

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 2a06449a1a..95ad86e38e 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -66,9 +66,12 @@ def ADD_LD_LIBRARY_PATH(path):
 def install_rpath(bld):
     '''the rpath value for installation'''
     bld.env['RPATH'] = []
+    ret = set()
     if bld.env.RPATH_ON_INSTALL:
-        return [bld.env.LIBDIR]
-    return []
+        ret.add(bld.env.LIBDIR)
+    if bld.env.RPATH_ON_INSTALL_PRIVATE:
+        ret.add(bld.env.PRIVATELIBDIR)
+    return list(ret)
 
 
 def build_rpath(bld):
-- 
cgit