From f66fcd96087fc0a65a214c0fa62b03048ff0c6d9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 26 Apr 2010 19:04:33 +1000
Subject: build: cope with realname for install of non-python libs

this fixes the install of mit_samba.so
---
 buildtools/wafsamba/samba_install.py | 5 ++++-
 buildtools/wafsamba/wafsamba.py      | 5 ++++-
 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
 
-- 
cgit