summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
l---------buildtools/bin/waf (renamed from buildtools/waf)0
-rwxr-xr-xbuildtools/bin/waf-svn (renamed from buildtools/waf-svn)bin107097 -> 107097 bytes
-rw-r--r--source4/Makefile.waf4
-rwxr-xr-xsource4/configure.waf2
4 files changed, 3 insertions, 3 deletions
diff --git a/buildtools/waf b/buildtools/bin/waf
index 1e5b242062..1e5b242062 120000
--- a/buildtools/waf
+++ b/buildtools/bin/waf
diff --git a/buildtools/waf-svn b/buildtools/bin/waf-svn
index 57ae204e25..57ae204e25 100755
--- a/buildtools/waf-svn
+++ b/buildtools/bin/waf-svn
Binary files differ
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