[SCM] Samba Shared Repository - branch master updated

Andrew Tridgell tridge at samba.org
Tue Oct 5 00:58:01 MDT 2010


The branch, master has been updated
       via  7c5d7a5 waf: workaround for the 'make install' breakage
      from  5548d3d Add missing dependencies for com_err.

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


- Log -----------------------------------------------------------------
commit 7c5d7a5b6337b8543ebb9c71e8d97eceb7a1e44e
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 5 17:17:31 2010 +1100

    waf: workaround for the 'make install' breakage
    
    This is a temporary workaround until Jelmer gets a chance to look at
    this
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Tue Oct  5 06:57:59 UTC 2010 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index fc925c5..05ea56c 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -24,7 +24,7 @@ def install_binary(self):
         return
 
     # work out the install path, expanding variables
-    install_path = self.samba_inst_path or '${BINDIR}'
+    install_path = getattr(self, 'samba_inst_path', None) or '${BINDIR}'
     install_path = bld.EXPAND_VARIABLES(install_path)
 
     orig_target = os.path.basename(self.target)
@@ -58,13 +58,13 @@ def install_library(self):
     install_ldflags = install_rpath(bld)
     build_ldflags   = build_rpath(bld)
 
-    if not Options.is_install or not self.samba_install:
+    if not Options.is_install or not getattr(self, 'samba_install', True):
         # just need to set the build rpath if we are not installing
         self.env.RPATH = build_ldflags
         return
 
     # setup the install path, expanding variables
-    install_path = self.samba_inst_path or '${LIBDIR}'
+    install_path = getattr(self, 'samba_inst_path', None) or '${LIBDIR}'
     install_path = bld.EXPAND_VARIABLES(install_path)
 
     if install_ldflags != build_ldflags:
@@ -83,7 +83,7 @@ def install_library(self):
 
     dev_link     = None
 
-    if self.samba_realname:
+    if getattr(self, 'samba_realname', None):
         install_name = self.samba_realname
         install_link = None
         if getattr(self, 'samba_type', None) == 'PYTHON':


-- 
Samba Shared Repository


More information about the samba-cvs mailing list