ctdb-build: Allow configure and Makefile to find waf in tarball

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/Makefile b/ctdb/Makefile
index 6d57b0ca4f9a15ae9f12b00f17a3ea51282ae068..b0912f275e76fe9e1a95ac79df9b7b6c1cc90315 100644 (file)
--- a/ctdb/Makefile
+++ b/ctdb/Makefile
@@ -1,6 +1,6 @@
 # simple makefile wrapper to run waf
 
-WAF=WAF_MAKE=1 PATH=../buildtools/bin:$$PATH waf
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../buildtools/bin:$$PATH waf
 
 all:
        $(WAF) build

diff --git a/ctdb/configure b/ctdb/configure
index 5357de415987db927a615c764732e3e5661c46b9..e8d01577cf7de6edb82c586161641cb45ee95926 100755 (executable)
--- a/ctdb/configure
+++ b/ctdb/configure
@@ -2,7 +2,8 @@
 
 PREVPATH=`dirname $0`
 
-WAF=../buildtools/bin/waf
+WAF=buildtools/bin/waf
+[ -x "$WAF" ] || WAF=../buildtools/bin/waf
 
 # using JOBS=1 gives maximum compatibility with
 # systems like AIX which have broken threading in python