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_deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'buildtools/wafsamba/samba_deps.py') diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index be77d2c611..c52275e813 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -240,7 +240,7 @@ def check_duplicate_sources(bld, tgt_list): for t in tgt_list: obj_sources = getattr(t, 'source', '') - tpath = os_path_relpath(t.path.abspath(bld.env), t.env['BUILD_DIRECTORY'] + '/default') + tpath = os_path_relpath(t.path.abspath(bld.env), t.env.BUILD_DIRECTORY + '/default') obj_sources = bld.SUBDIR(tpath, obj_sources) t.samba_source_set = set(TO_LIST(obj_sources)) -- cgit