git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
666d019
)
s3-waf: find swat files for both toplevel and source3 build
author
Andrew Tridgell
<tridge@samba.org>
Mon, 21 Feb 2011 00:14:49 +0000
(11:14 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Tue, 22 Feb 2011 01:51:09 +0000
(
02:51
+0100)
this finds the right swat files in both cases
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
source3/wscript_build
patch
|
blob
|
history
diff --git
a/source3/wscript_build
b/source3/wscript_build
index de774de00aa6914957254cdb5bae6efb5838c14d..8c7f1fda879e06074cd486a0e2fd6d98e813de63 100644
(file)
--- 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.