summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-03-02 11:40:33 +1100
committerAndrew Tridgell <tridge@samba.org>2011-03-02 02:49:34 +0100
commit8870fcb154d27c0d10d3de3f926a95743b6e4e28 (patch)
treeab279e94f291e16cb528f2d102ce432ffebb95e3 /buildtools/wafsamba
parent0a78c57be64c3b47b0a685c248c7738559a64bf0 (diff)
downloadsamba-8870fcb154d27c0d10d3de3f926a95743b6e4e28.tar.gz
samba-8870fcb154d27c0d10d3de3f926a95743b6e4e28.tar.bz2
samba-8870fcb154d27c0d10d3de3f926a95743b6e4e28.zip
build: fixed the ELF name for private libraries
thanks to Simo and rpmbuild for spotting this! Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Wed Mar 2 02:49:34 CET 2011 on sn-devel-104
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/samba_install.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 3e055d7ed8..d755d01078 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -124,8 +124,12 @@ def install_library(self):
install_link = None
inst_name = bld.make_libname(t.target)
- if t.env.SONAME_ST and install_link:
- t.env.append_value('LINKFLAGS', t.env.SONAME_ST % install_link)
+ if t.env.SONAME_ST:
+ # ensure we get the right names in the library
+ if install_link:
+ t.env.append_value('LINKFLAGS', t.env.SONAME_ST % install_link)
+ else:
+ t.env.append_value('LINKFLAGS', t.env.SONAME_ST % install_name)
t.env.SONAME_ST = ''
# tell waf to install the library