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/talloc/wscript | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/talloc') diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 17b3b1d349..e577643595 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -5,16 +5,18 @@ VERSION = '2.0.2' blddir = 'bin' +import os, sys + # find the buildtools directory -import os -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") -LIBREPLACE_DIR= srcdir + '/lib/replace' +LIBREPLACE_DIR= '../replace' import sys sys.path.insert(0, srcdir+"/buildtools/wafsamba") -- cgit