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

Signed-off-by: Martin Schwenke <[email protected]> Reviewed-by: Amitay Isaacs <[email protected]>
peaxy · Sep 9, 2014 · ef72188 · ef72188
1 parent 751ad4b
commit ef72188
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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