From 8dc8d31f4adf84f35bce34339e13e9d70c4b8a66 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 4 Apr 2010 11:40:05 +1000 Subject: s4-waf: fixed finding of buildtools and srcdir --- lib/tevent/wscript | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/tevent') diff --git a/lib/tevent/wscript b/lib/tevent/wscript index 976048d016..cc139ccee5 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -8,19 +8,19 @@ blddir = 'bin' import sys, os # find the buildtools directory -buildtools = 'buildtools ../../buildtools' -for d in buildtools.split(): - if os.path.exists(d): - srcdir = os.path.dirname(d) or '.' - break +buildtools = 'buildtools' +while not os.path.exists(buildtools) and len(buildtools.split('/')) < 5: + buildtools = '../' + buildtools +srcdir = os.path.dirname(buildtools) or '.' + +sys.path.insert(0, buildtools + "/wafsamba") -sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba, samba_dist samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools') -LIBREPLACE_DIR= srcdir + '/lib/replace' -LIBTALLOC_DIR= srcdir + '/lib/talloc' +LIBREPLACE_DIR= '../replace' +LIBTALLOC_DIR= '../talloc' def set_options(opt): opt.BUILTIN_DEFAULT('replace') -- cgit