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/tdb/wscript | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'lib/tdb') diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 3004c2dd92..8c941948c8 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -8,19 +8,18 @@ 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, srcdir+"/buildtools/wafsamba") +sys.path.insert(0, buildtools + "/wafsamba") import wafsamba, samba_dist samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools') -LIBREPLACE_DIR= srcdir + '/lib/replace' +LIBREPLACE_DIR= '../replace' def set_options(opt): opt.BUILTIN_DEFAULT('replace') -- cgit