build: move waf into buildtools/bin

diff --git a/buildtools/waf b/buildtools/bin/waf
similarity index 100%
rename from buildtools/waf
rename to buildtools/bin/waf

diff --git a/buildtools/waf-svn b/buildtools/bin/waf-svn
similarity index 100%
rename from buildtools/waf-svn
rename to buildtools/bin/waf-svn

diff --git a/source4/Makefile.waf b/source4/Makefile.waf
index e304540637d59bce482101112a90af4bf684b987..1e950ed18c98178bf87b89df043607c7a68b791c 100644 (file)
--- 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 b297b9327847de1946fa59a7c5d5b8aa7306affa..40dfac6de443c3947f3aae05ef20489e6e420fda 100755 (executable)
--- 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