From 14718a725b65828c470167b922260840343d9843 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 4 Nov 2010 08:29:11 +1100
Subject: [PATCH] build: a more portable way of finding waf in makefiles

this avoids using the non-portable shell command in makefiles

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Nov  3 22:44:59 UTC 2010 on sn-devel-104
---
 lib/replace/Makefile     | 4 +---
 lib/talloc/Makefile      | 4 +---
 lib/tevent/Makefile      | 4 +---
 source4/lib/ldb/Makefile | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/replace/Makefile b/lib/replace/Makefile
index 3082459add9..5b8220c6cb7 100644
--- a/lib/replace/Makefile
+++ b/lib/replace/Makefile
@@ -1,8 +1,6 @@
 # simple makefile wrapper to run waf
 
-WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
-
-WAF=WAF_MAKE=1 $(WAFPATH)
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
 
 all:
 	$(WAF) build
diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile
index 3082459add9..5b8220c6cb7 100644
--- a/lib/talloc/Makefile
+++ b/lib/talloc/Makefile
@@ -1,8 +1,6 @@
 # simple makefile wrapper to run waf
 
-WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
-
-WAF=WAF_MAKE=1 $(WAFPATH)
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
 
 all:
 	$(WAF) build
diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile
index 3f188a955fd..f178363dbc6 100644
--- a/lib/tevent/Makefile
+++ b/lib/tevent/Makefile
@@ -1,8 +1,6 @@
 # simple makefile wrapper to run waf
 
-WAFPATH:=$(shell PATH=../../buildtools/bin:buildtools/bin:$(PATH) which waf)
-
-WAF=WAF_MAKE=1 $(WAFPATH)
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
 
 all:
 	$(WAF) build
diff --git a/source4/lib/ldb/Makefile b/source4/lib/ldb/Makefile
index 3d0d8e49382..da05bcfb6dc 100644
--- a/source4/lib/ldb/Makefile
+++ b/source4/lib/ldb/Makefile
@@ -1,8 +1,6 @@
 # simple makefile wrapper to run waf
 
-WAFPATH:=$(shell PATH=../../../buildtools/bin:buildtools/bin:$(PATH) which waf)
-
-WAF=WAF_MAKE=1 $(WAFPATH)
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../../buildtools/bin:$$PATH waf
 
 all:
 	$(WAF) build
-- 
2.34.1