summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-26 19:04:33 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-26 19:06:06 +1000
commitf66fcd96087fc0a65a214c0fa62b03048ff0c6d9 (patch)
tree6adc9b31558e698037fe0dda7962a0a2f59b63bb /buildtools/wafsamba
parent267e0b361693a94be258a21b2b305c5a97de3dda (diff)
downloadsamba-f66fcd96087fc0a65a214c0fa62b03048ff0c6d9.tar.gz
samba-f66fcd96087fc0a65a214c0fa62b03048ff0c6d9.tar.bz2
samba-f66fcd96087fc0a65a214c0fa62b03048ff0c6d9.zip
build: cope with realname for install of non-python libs
this fixes the install of mit_samba.so
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/samba_install.py5
-rw-r--r--buildtools/wafsamba/wafsamba.py5
2 files changed, 8 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index e2db589ff0..55aab26a50 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -87,7 +87,10 @@ def install_library(self):
if self.samba_realname:
install_name = self.samba_realname
install_link = None
- inst_name = t.target + '.so'
+ if getattr(self, 'samba_type', None) == 'PYTHON':
+ inst_name = '%s.so' % t.target
+ else:
+ inst_name = 'lib%s.so' % t.target
elif self.vnum:
vnum_base = self.vnum.split('.')[0]
install_name = 'lib%s.so.%s' % (self.target, self.vnum)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 36f8777226..6d6416b798 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -161,7 +161,7 @@ def SAMBA_LIBRARY(bld, libname, source,
deps = TO_LIST(deps)
deps.append(obj_target)
- if target_type == 'PYTHON':
+ if target_type == 'PYTHON' or realname:
bundled_name = libname
else:
bundled_name = BUNDLED_NAME(bld, libname, bundled_extension)
@@ -197,6 +197,9 @@ def SAMBA_LIBRARY(bld, libname, source,
abi_match = abi_match
)
+ if realname and not link_name:
+ link_name = 'shared/%s' % realname
+
if link_name:
t.link_name = link_name