summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-12-17 18:47:05 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-12-17 18:47:05 +0100
commit5bccb326437198098a39abf9387dc61c9c4066b3 (patch)
tree0b98c051ab3dc924d5b142612497f447f2161937 /buildtools
parent85299bea65e152b4423ee40dd7f241189d52c6af (diff)
downloadsamba-5bccb326437198098a39abf9387dc61c9c4066b3.tar.gz
samba-5bccb326437198098a39abf9387dc61c9c4066b3.tar.bz2
samba-5bccb326437198098a39abf9387dc61c9c4066b3.zip
Simplify link installation.
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_install.py11
1 files changed, 3 insertions, 8 deletions
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')