s4-waf: Fix installation of .so links for libraries that are not bundled but have...

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 4e968bf97cc35928b31268428d78e8cc671900e3..41722098bcf8fcd4c3f6c484615f9902982167cc 100644 (file)
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -97,7 +97,7 @@ def install_library(self):
         install_name = 'lib%s.so.%s' % (self.target, self.vnum)
         install_link = 'lib%s.so.%s' % (self.target, vnum_base)
         inst_name    = 'lib%s.so' % t.target
-        if self.target == self.name:
+        if not self.is_bundled:
             # only generate the dev link for non-bundled libs
             dev_link     = 'lib%s.so' % self.target
     else:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 48584b600d609dd86ac225d98bb1fe2203250060..4b0580daeb3498fbbb4aa28d8ed7d4c3e718cef5 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -201,7 +201,8 @@ def SAMBA_LIBRARY(bld, libname, source,
         samba_realname  = realname,
         samba_install   = install,
         abi_file        = abi_file,
-        abi_match       = abi_match
+        abi_match       = abi_match,
+        is_bundled      = is_bundled
         )
 
     if realname and not link_name: