summaryrefslogtreecommitdiff
path: root/lib/talloc
diff options
context:
space:
mode:
authorDavid Mulder <dmulder@suse.com>2019-02-07 10:47:47 -0700
committerStefan Metzmacher <metze@samba.org>2019-02-26 10:39:24 +0100
commit5ed5c337644c641aba0d07f3668d478050e5f69e (patch)
treef9a458f990bcd70caff374fed9b443b5d0f9a050 /lib/talloc
parentde3bb5cd5236565f2b79644d99e55d03b254b65e (diff)
downloadsamba-5ed5c337644c641aba0d07f3668d478050e5f69e.tar.gz
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 <dmulder@suse.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/talloc')
-rw-r--r--lib/talloc/Makefile3
1 files changed, 2 insertions, 1 deletions
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: