diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-04 11:40:05 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:25 +1000 |
| commit | 8dc8d31f4adf84f35bce34339e13e9d70c4b8a66 (patch) | |
| tree | 005fde61525402770d9aeec01f9533db86449960 /source4/lib | |
| parent | a8840087979f891c50e01e647df21759e556a7c8 (diff) | |
| download | samba-8dc8d31f4adf84f35bce34339e13e9d70c4b8a66.tar.gz samba-8dc8d31f4adf84f35bce34339e13e9d70c4b8a66.tar.bz2 samba-8dc8d31f4adf84f35bce34339e13e9d70c4b8a66.zip | |
s4-waf: fixed finding of buildtools and srcdir
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/wscript | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index e40d46ee75..968485f69f 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -7,22 +7,21 @@ 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/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc lib/tdb:lib/tdb lib/tevent:lib/tevent buildtools:buildtools''') -LIBTDB_DIR= srcdir + '/lib/tdb' -LIBTEVENT_DIR= srcdir + '/lib/tevent' -LIBPOPT_DIR= srcdir + '/lib/popt' +LIBTDB_DIR= '../../../lib/tdb' +LIBTEVENT_DIR= '../../../lib/tevent' +LIBPOPT_DIR= '../../../lib/popt' def set_options(opt): opt.BUILTIN_DEFAULT('replace') |