From 5bccb326437198098a39abf9387dc61c9c4066b3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 17 Dec 2010 18:47:05 +0100 Subject: Simplify link installation. --- buildtools/wafsamba/samba_install.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'buildtools/wafsamba/samba_install.py') diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 327227f7f5..471ef5a49e 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -128,19 +128,14 @@ def install_library(self): t.env.append_value('LINKFLAGS', t.env.SONAME_ST % install_link) t.env.SONAME_ST = '' - if install_name == install_link: - install_link = None - # tell waf to install the library bld.install_as(os.path.join(install_path, install_name), os.path.join(self.path.abspath(bld.env), inst_name)) - if install_link: + if install_link and install_link != install_name: # and the symlink if needed - bld.symlink_as(os.path.join(install_path, install_link), - install_name) + bld.symlink_as(os.path.join(install_path, install_link), install_name) if dev_link: - bld.symlink_as(os.path.join(install_path, dev_link), - install_name) + bld.symlink_as(os.path.join(install_path, dev_link), install_name) @feature('cshlib') -- cgit