From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 21 Feb 2011 00:14:49 +0000 (+1100)
Subject: s3-waf: find swat files for both toplevel and source3 build
X-Git-Tag: tevent-0.9.11~408
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf3225d6c3898bfd425aedc894a1ddd7a484fd2a;p=thirdparty%2Fsamba.git

s3-waf: find swat files for both toplevel and source3 build

this finds the right swat files in both cases

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/wscript_build b/source3/wscript_build
index de774de00aa..8c7f1fda879 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1339,7 +1339,8 @@ bld.SAMBA3_BINARY('vlp',
                  deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
                  vars=locals())
 
-swat_files=recursive_dirlist('../swat', '../swat', '*')
+swat_dir = os.path.join(bld.curdir, '../swat')
+swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
 bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
 
 # additional compatibility rules.