4 files changed, 30 insertions, 29 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index db6bc5c450..af70c47a24 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -5,16 +5,16 @@ VERSION = '1.2.1'
 
 blddir = 'bin'
 
-import sys, os
+import sys, os, Utils
 
 # 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
 import Options, os, preproc
 
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")
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')
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')