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 /lib/replace/wscript | |
| 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 'lib/replace/wscript')
| -rw-r--r-- | lib/replace/wscript | 14 |
1 files changed, 7 insertions, 7 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 |