From 5ed5c337644c641aba0d07f3668d478050e5f69e Mon Sep 17 00:00:00 2001 From: David Mulder Date: Thu, 7 Feb 2019 10:47:47 -0700 Subject: Search for location of waf script When calling make from the ldb, talloc, tdb, and tevent bundles, we need to first find the location of the waf script. Currently the build fails since it can't find waf. Fixes regression caused by a660b7f. Signed-off-by: David Mulder Reviewed-by: Andrew Bartlett --- lib/ldb/Makefile | 3 ++- lib/talloc/Makefile | 3 ++- lib/tdb/Makefile | 3 ++- lib/tevent/Makefile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/ldb/Makefile b/lib/ldb/Makefile index 18ef459eb16..b82723f35ed 100644 --- a/lib/ldb/Makefile +++ b/lib/ldb/Makefile @@ -1,6 +1,7 @@ # simple makefile wrapper to run waf -WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf +WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf` +WAF_BINARY=$(PYTHON) $(WAF_BIN) WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) all: diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile index 36048e56e2d..db2275c7397 100644 --- a/lib/talloc/Makefile +++ b/lib/talloc/Makefile @@ -1,6 +1,7 @@ # simple makefile wrapper to run waf -WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf +WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf` +WAF_BINARY=$(PYTHON) $(WAF_BIN) WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) all: diff --git a/lib/tdb/Makefile b/lib/tdb/Makefile index 3e70146c248..8fd56c814ec 100644 --- a/lib/tdb/Makefile +++ b/lib/tdb/Makefile @@ -1,6 +1,7 @@ # simple makefile wrapper to run waf -WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf +WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf` +WAF_BINARY=$(PYTHON) $(WAF_BIN) WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) all: diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile index c3676a4f425..6a3aab0cabb 100644 --- a/lib/tevent/Makefile +++ b/lib/tevent/Makefile @@ -1,5 +1,6 @@ # simple makefile wrapper to run waf -WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf +WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf` +WAF_BINARY=$(PYTHON) $(WAF_BIN) WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) all: -- cgit v1.2.1