summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-29 07:07:18 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:15 +1000
commitc6e73cb3b601dbbe737a7692e53c6fb9c72dff7b (patch)
tree5b0bbd01c2b08fb119929e3f5e38cb7b653cdb89 /source4
parenta2b4d7e8ebf24bc65cceb38bf23d8d8dc3307d27 (diff)
downloadsamba-c6e73cb3b601dbbe737a7692e53c6fb9c72dff7b.tar.gz
samba-c6e73cb3b601dbbe737a7692e53c6fb9c72dff7b.tar.bz2
samba-c6e73cb3b601dbbe737a7692e53c6fb9c72dff7b.zip
build: move waf into buildtools/bin
Diffstat (limited to 'source4')
-rw-r--r--source4/Makefile.waf4
-rwxr-xr-xsource4/configure.waf2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/Makefile.waf b/source4/Makefile.waf
index e304540637..1e950ed18c 100644
--- a/source4/Makefile.waf
+++ b/source4/Makefile.waf
@@ -10,7 +10,7 @@
# from make to pass it to waf?
JOBS=1
-WAF=JOBS=$(JOBS) ../buildtools/waf
+WAF=JOBS=$(JOBS) ../buildtools/bin/waf
all:
$(WAF) build
@@ -30,7 +30,7 @@ quicktest:
clean:
$(WAF) clean
-distclean:
+distclean: clean
rm -rf bin
# some compatibility make targets
diff --git a/source4/configure.waf b/source4/configure.waf
index b297b93278..40dfac6de4 100755
--- a/source4/configure.waf
+++ b/source4/configure.waf
@@ -2,7 +2,7 @@
echo "Using waf based build"
-WAF=../buildtools/waf
+WAF=../buildtools/bin/waf
# don't enable WAFCACHE by default till it is
# size limited