[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  8c14dec build: fixed development symlinks for libraries in subdirectories
       via  720da3c build: fixed dependencies on install prefix for pc files and python scripts
      from  5d736d8 s3:utils/net_*registry: use c99 initializers which are supported by old gcc 2.95 compilers (bug #8226)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8c14decdb8cbc5622d7cf9804bef857d0538ede0
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Jun 15 14:13:04 2011 +1000

    build: fixed development symlinks for libraries in subdirectories
    
    this fixes the symlink for libsmbclient.so
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Wed Jun 15 07:23:10 CEST 2011 on sn-devel-104

commit 720da3cb9131d4e3bdd0352538f0c5d52c4655c8
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Jun 15 13:53:19 2011 +1000

    build: fixed dependencies on install prefix for pc files and python scripts
    
    waf can't automatically determine these dependencies as the
    construction of the files is via a python function
    
    thanks to Andrew for noticing this bug

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/pkgconfig.py     |    1 +
 buildtools/wafsamba/samba_install.py |    4 ++--
 buildtools/wafsamba/wafsamba.py      |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py
index 09bfcb9..8a3f807 100644
--- a/buildtools/wafsamba/pkgconfig.py
+++ b/buildtools/wafsamba/pkgconfig.py
@@ -53,6 +53,7 @@ def PKG_CONFIG_FILES(bld, pc_files, vnum=None):
                                 rule=subst_at_vars,
                                 source=f+'.in',
                                 target=f)
+        bld.add_manual_dependency(bld.path.find_or_declare(f), bld.env['PREFIX'])
         t.vars = []
         if t.env.RPATH_ON_INSTALL:
             t.env.LIB_RPATH = t.env.RPATH_ST % t.env.LIBDIR
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index d755d01..26d0a37 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -137,9 +137,9 @@ def install_library(self):
                    os.path.join(self.path.abspath(bld.env), inst_name))
     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), os.path.basename(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), os.path.basename(install_name))
 
 
 @feature('cshlib')
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 43b7f61..d76afc4 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -692,6 +692,8 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
                             rule=copy_and_fix_python_path,
                             source=file,
                             target=inst_file)
+        bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONARCHDIR"])
+        bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONDIR"])
         file = inst_file
     if base_name:
         file = os.path.join(base_name, file)


-- 
Samba Shared Repository