diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-08-19 11:59:03 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-09-10 01:36:14 +0200 |
| commit | ef72188302f3c2ce85c676c2ddf544d734d390c2 (patch) | |
| tree | f7c6feda0d7b8c7770e903324c4c9f28aab54b36 /ctdb | |
| parent | 751ad4b62561b140b7a33d66e63907411a748501 (diff) | |
| download | samba-ef72188302f3c2ce85c676c2ddf544d734d390c2.tar.gz | |
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>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/Makefile | 2 | ||||
| -rwxr-xr-x | ctdb/configure | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/Makefile b/ctdb/Makefile index 6d57b0ca4f9..b0912f275e7 100644 --- 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 5357de41598..e8d01577cf7 100755 --- 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 |