summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba/samba_install.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-05 02:30:01 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-05 02:06:06 +0000
commitc9756cac057444ff7c3a77b9260fa30c35267529 (patch)
tree7d7a4fb5846719354d77dcee46db9b7dc4b073f6 /buildtools/wafsamba/samba_install.py
parent21233bba9663f684cfa1ad129baa988cb52dea4d (diff)
downloadsamba-c9756cac057444ff7c3a77b9260fa30c35267529.tar.gz
samba-c9756cac057444ff7c3a77b9260fa30c35267529.tar.bz2
samba-c9756cac057444ff7c3a77b9260fa30c35267529.zip
waf: Put private libraries in a separate directory when building.
Thanks to Tridge for pointing out what exactly I had to change. :-)
Diffstat (limited to 'buildtools/wafsamba/samba_install.py')
-rw-r--r--buildtools/wafsamba/samba_install.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 8b9a308a2c..9401d228c5 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -160,7 +160,11 @@ def symlink_lib(self):
link_target = getattr(self, 'link_name', '')
if link_target == '':
- link_target = '%s/%s' % (LIB_PATH, self.bld.make_libname(self.target, version=soext))
+ basename = self.bld.make_libname(self.target, version=soext)
+ if getattr(self, "private_library", False):
+ link_target = '%s/private/%s' % (LIB_PATH, basename)
+ else:
+ link_target = '%s/%s' % (LIB_PATH, basename)
link_target = os.path.join(blddir, link_target)