diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-13 20:52:47 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-13 20:52:47 +0200 |
| commit | 2edd6527294617384b55b151950a21cf08fb79d1 (patch) | |
| tree | 38e22aa5c642dd9c14ea4c20c0bc105c19caa5d2 | |
| parent | d319c83f1f117d3b7ab69ec7b0df7eec80721912 (diff) | |
| download | samba-2edd6527294617384b55b151950a21cf08fb79d1.tar.gz samba-2edd6527294617384b55b151950a21cf08fb79d1.tar.bz2 samba-2edd6527294617384b55b151950a21cf08fb79d1.zip | |
s4-waf: Fix installation of .so links for libraries that are not bundled but have a mangled name.
| -rw-r--r-- | buildtools/wafsamba/samba_install.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 4e968bf97c..41722098bc 100644 --- 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 48584b600d..4b0580daeb 100644 --- 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: |