sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

waf: workaround for the 'make install' breakage

Browse Source 
This is a temporary workaround until Jelmer gets a chance to look at
this

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Tue Oct  5 06:57:59 UTC 2010 on sn-devel-104
This commit is contained in:
Andrew Tridgell 2010-10-05 17:17:31 +11:00
parent 5548d3d41e
commit 7c5d7a5b63
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildtools/wafsamba/samba_install.py
View File

@ -24,7 +24,7 @@ def install_binary(self):
return return
# work out the install path, expanding variables # 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) install_path = bld.EXPAND_VARIABLES(install_path)
orig_target = os.path.basename(self.target) orig_target = os.path.basename(self.target)
@ -58,13 +58,13 @@ def install_library(self):
install_ldflags = install_rpath(bld) install_ldflags = install_rpath(bld)
build_ldflags = build_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 # just need to set the build rpath if we are not installing
self.env.RPATH = build_ldflags self.env.RPATH = build_ldflags
return return
# setup the install path, expanding variables # 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) install_path = bld.EXPAND_VARIABLES(install_path)
if install_ldflags != build_ldflags: if install_ldflags != build_ldflags:
@ -83,7 +83,7 @@ def install_library(self):
dev_link = None dev_link = None
if self.samba_realname: if getattr(self, 'samba_realname', None):
install_name = self.samba_realname install_name = self.samba_realname
install_link = None install_link = None
if getattr(self, 'samba_type', None) == 'PYTHON': if getattr(self, 'samba_type', None) == 'PYTHON':