From 4ca46c6b8dfd9d7450096fc16c6edd7a08f369e5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 8 Apr 2010 21:46:20 +1000 Subject: build: make the handling of relative paths a bit saner This should fix a problem that Anatoliy has struck with the PIDL rules. It also brings us much closer to a working build for a true out of tree build (ie. with waf configure -b /tmp/build) --- buildtools/wafsamba/samba_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildtools/wafsamba/samba_utils.py') diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index a527e811fa..1df70fdbf5 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -72,7 +72,7 @@ def install_rpath(bld): def build_rpath(bld): '''the rpath value for build''' - rpath = os.path.normpath('%s/%s' % (bld.env['BUILD_DIRECTORY'], LIB_PATH)) + rpath = os.path.normpath('%s/%s' % (bld.env.BUILD_DIRECTORY, LIB_PATH)) bld.env['RPATH'] = [] bld.env['RPATH_ST'] = [] if bld.env.RPATH_ON_BUILD: -- cgit