The branch, master has been updated
via e427f2f waf: fixed the names of the installed libraries after the
last change
from 5a6a9ea s4-dns: ensure we get the right case on the grant rule for
administrator
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e427f2fc813d96a59fc3a98f6a94df209c301d2b
Author: Andrew Tridgell <tri...@samba.org>
Date: Mon Nov 8 12:47:09 2010 +1100
waf: fixed the names of the installed libraries after the last change
Autobuild-User: Andrew Tridgell <tri...@samba.org>
Autobuild-Date: Mon Nov 8 02:31:18 UTC 2010 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_install.py | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_install.py
b/buildtools/wafsamba/samba_install.py
index 634d5b1..bf534f0 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -76,6 +76,8 @@ def install_library(self):
install_path = '${LIBDIR}'
install_path = bld.EXPAND_VARIABLES(install_path)
+ target_name = self.target
+
if install_ldflags != build_ldflags:
# we will be creating a new target name, and using that for the
# install link. That stops us from overwriting the existing build
@@ -92,6 +94,12 @@ def install_library(self):
dev_link = None
+ # in the following the names are:
+ # - inst_name is the name with .inst. in it, in the build
+ # directory
+ # - install_name is the name in the install directory
+ # - install_link is a symlink in the install directory, to install_name
+
if getattr(self, 'samba_realname', None):
install_name = self.samba_realname
install_link = None
@@ -101,18 +109,18 @@ def install_library(self):
inst_name = bld.make_libname(t.target)
elif self.vnum:
vnum_base = self.vnum.split('.')[0]
- install_name = bld.make_libname(self.target, version=self.vnum)
- install_link = bld.make_libname(self.target, version=vnum_base)
+ install_name = bld.make_libname(target_name, version=self.vnum)
+ install_link = bld.make_libname(target_name, version=vnum_base)
inst_name = bld.make_libname(t.target)
if not self.private_library:
# only generate the dev link for non-bundled libs
- dev_link = bld.make_libname(self.target)
+ dev_link = bld.make_libname(target_name)
elif getattr(self, 'soname', ''):
- install_name = bld.make_libname(self.target)
+ install_name = bld.make_libname(target_name)
install_link = self.soname
inst_name = bld.make_libname(t.target)
else:
- install_name = bld.make_libname(self.target)
+ install_name = bld.make_libname(target_name)
install_link = None
inst_name = bld.make_libname(t.target)
--
Samba Shared Repository
