ldb:build: improve detection of srcdir v4-1-test
authorMichael Adam <obnox@samba.org>
Fri, 20 Jun 2014 16:08:53 +0000 (18:08 +0200)
committerKarolin Seeger <kseeger@samba.org>
Tue, 15 Jul 2014 10:46:14 +0000 (12:46 +0200)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 09b991b79b28c9a88742e06021bb15997aba8988)

The last 28 patches address bug #10693 - backport ldb-1.1.17 + changes from
master.

ldb/wscript

index e88e95a73631a21ee2b273a26e5dcbd3f1d5e988..a375675a158299be49aa45bbdb59ac52b4351156 100755 (executable)
@@ -10,7 +10,7 @@ import sys, os
 # find the buildtools directory
 srcdir = '.'
 while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5:
-    srcdir = '../' + srcdir
+    srcdir = srcdir + '/..'
 sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
 import wafsamba, samba_dist, Options