git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fdcbc08)
build: a more portable way of finding waf in makefiles
authorAndrew Tridgell <tridge@samba.org>
Wed, 3 Nov 2010 21:29:11 +0000 (08:29 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 3 Nov 2010 22:44:59 +0000 (22:44 +0000)
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 patch | blob | history
lib/talloc/Makefile patch | blob | history
lib/tevent/Makefile patch | blob | history
source4/lib/ldb/Makefile patch | blob | history

diff --git a/lib/replace/Makefile b/lib/replace/Makefile
index 3082459add927010946532358b883cd5b7aebff3..5b8220c6cb7fc476f57dc9dfb8eac50417343a94 100644 (file)
--- 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 3082459add927010946532358b883cd5b7aebff3..5b8220c6cb7fc476f57dc9dfb8eac50417343a94 100644 (file)
--- 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 3f188a955fdc2ee6a146218765c7ebbb8117411b..f178363dbc6697af76c217dfdd1f6596fd6c927c 100644 (file)
--- 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 3d0d8e493821d28e8f10b873369e4d4186b03f31..da05bcfb6dc8768ff046f9d04f4d1c3779696b5a 100644 (file)
--- 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
Samba Shared Repository