From: Amitay Isaacs <amitay@gmail.com>
Date: Fri, 8 Jul 2016 13:37:18 +0000 (+1000)
Subject: swrap: Build socket_wrapper path relative to blddir
X-Git-Tag: tdb-1.3.10~431
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1c2a1cb9f2e25da3e674abda02227cc7e3a8b0d;p=thirdparty%2Fsamba.git

swrap: Build socket_wrapper path relative to blddir

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
---

diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript
index 4b6e5fa1aa2..dbefa83ea33 100644
--- a/lib/socket_wrapper/wscript
+++ b/lib/socket_wrapper/wscript
@@ -96,8 +96,8 @@ def configure(conf):
                                    define='HAVE_EVENTFD_UNSIGNED_INT', headers='sys/eventfd.h')
 
         # Create full path to socket_wrapper
-        srcdir = os.path.realpath(conf.srcdir)
-        libsocket_wrapper_so_path = srcdir + '/bin/default/lib/socket_wrapper/libsocket-wrapper.so'
+        blddir = os.path.realpath(conf.blddir)
+        libsocket_wrapper_so_path = blddir + '/default/lib/socket_wrapper/libsocket-wrapper.so'
 
     conf.DEFINE('LIBSOCKET_WRAPPER_SO_PATH', libsocket_wrapper_so_path)
     conf.DEFINE('SOCKET_WRAPPER', 1)