summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-06 20:48:15 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:48:33 +1000
commitbadc255748aa71f98c99c4c47343011286c8445d (patch)
treeead33e2af63869c2cd49456f2c583b427b04a117
parent07d9da4d2f77d08c3a073453f4eaaf5c0939ccf5 (diff)
downloadsamba-badc255748aa71f98c99c4c47343011286c8445d.tar.gz
samba-badc255748aa71f98c99c4c47343011286c8445d.tar.bz2
samba-badc255748aa71f98c99c4c47343011286c8445d.zip
s4-build: remove any 'makefile' that may have been left by the waf build
this allows ./autogen.sh to be used to switch back to the old build system after trying the waf build
-rwxr-xr-xsource4/autogen.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/autogen.sh b/source4/autogen.sh
index 1936af4351..86fb1ac7ab 100755
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -80,5 +80,8 @@ $AUTOCONF $IPATHS || exit 1
rm -rf autom4te*.cache
+# remove a 'makefile' that may have been left by the waf build
+rm -f makefile
+
echo "Now run ./configure (or ./configure.developer) and then make."
exit 0