From 8870fcb154d27c0d10d3de3f926a95743b6e4e28 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 2 Mar 2011 11:40:33 +1100 Subject: build: fixed the ELF name for private libraries thanks to Simo and rpmbuild for spotting this! Autobuild-User: Andrew Tridgell Autobuild-Date: Wed Mar 2 02:49:34 CET 2011 on sn-devel-104 --- buildtools/wafsamba/samba_install.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'buildtools') 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 -- cgit