diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-11-05 00:03:20 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-11-05 02:06:05 +0000 |
| commit | e84e8705a98f3525f680a3d7e35ad55ae5370f51 (patch) | |
| tree | c0020f7b91da1178eeea7c70e6e9aefb81c3f69d /buildtools/wafsamba/samba_utils.py | |
| parent | e15cd9c6d5262b516b43208fd41ac398606caa46 (diff) | |
| download | samba-e84e8705a98f3525f680a3d7e35ad55ae5370f51.tar.gz samba-e84e8705a98f3525f680a3d7e35ad55ae5370f51.tar.bz2 samba-e84e8705a98f3525f680a3d7e35ad55ae5370f51.zip | |
Add --disable-rpath-private-install flag.
Diffstat (limited to 'buildtools/wafsamba/samba_utils.py')
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 7 |
1 files changed, 5 insertions, 2 deletions
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): |