summaryrefslogtreecommitdiff
path: root/lib/tevent
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-04 11:40:05 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:25 +1000
commit8dc8d31f4adf84f35bce34339e13e9d70c4b8a66 (patch)
tree005fde61525402770d9aeec01f9533db86449960 /lib/tevent
parenta8840087979f891c50e01e647df21759e556a7c8 (diff)
downloadsamba-8dc8d31f4adf84f35bce34339e13e9d70c4b8a66.tar.gz
samba-8dc8d31f4adf84f35bce34339e13e9d70c4b8a66.tar.bz2
samba-8dc8d31f4adf84f35bce34339e13e9d70c4b8a66.zip
s4-waf: fixed finding of buildtools and srcdir
Diffstat (limited to 'lib/tevent')
-rw-r--r--lib/tevent/wscript16
1 files changed, 8 insertions, 8 deletions
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')