summaryrefslogtreecommitdiff
path: root/source3/wscript_build
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-21 11:14:49 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-22 02:51:09 +0100
commitcf3225d6c3898bfd425aedc894a1ddd7a484fd2a (patch)
tree9d8fbb769f22dd1b184e30f39686e987790f4f78 /source3/wscript_build
parent666d01911042680039276209c1872b5d778e4015 (diff)
downloadsamba-cf3225d6c3898bfd425aedc894a1ddd7a484fd2a.tar.gz
samba-cf3225d6c3898bfd425aedc894a1ddd7a484fd2a.tar.bz2
samba-cf3225d6c3898bfd425aedc894a1ddd7a484fd2a.zip
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>
Diffstat (limited to 'source3/wscript_build')
-rw-r--r--source3/wscript_build3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index de774de00a..8c7f1fda87 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.