s4:autogen-waf: generate 'Makefile' instead of 'makefile'

This hopefully fixes the build on MacOS 10.

metze

diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf
index 78cd0e1e73a112e4ea7823063d0d35258a3a2192..a1c4b695251cdc2fbf95fee7f53e5b49dc8ebe90 100644 (file)
--- a/buildtools/scripts/Makefile.waf
+++ b/buildtools/scripts/Makefile.waf
@@ -49,3 +49,10 @@ etags:
 ctags:
        $(WAF) ctags
 
+configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf
+       @echo "please run ./autogen-waf.sh to regenerate $@"
+       @-false
+
+Makefile: autogen-waf.sh configure BUILDTOOLS/scripts/Makefile.waf
+       @echo "please run ./autogen-waf.sh to regenerate $@"
+       @false

diff --git a/source4/autogen-waf.sh b/source4/autogen-waf.sh
index a3aa979f517f4980214b68aa3f7783d9c44debf3..7a6e94c5ec4dea167eb2496617e2ab142c32d728 100755 (executable)
--- a/source4/autogen-waf.sh
+++ b/source4/autogen-waf.sh
@@ -12,14 +12,13 @@ while test \! -d "$p/$d"; do d="../$d"; done
 echo "Found buildtools in $p/$d"
 
 echo "Setting up configure"
-rm -f $p/configure
+rm -f $p/configure $p/include/config*.h*
 sed "s|BUILDTOOLS|$d|g;s|BUILDPATH|$p|g" < "$p/$d/scripts/configure.waf" > $p/configure
 chmod +x $p/configure
 
-echo "Setting up makefile"
-# this relies on the fact that make looks for 'makefile' before 'Makefile'
-rm -f $p/makefile
-sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/makefile
+echo "Setting up Makefile"
+rm -f $p/makefile $p/Makefile
+sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/Makefile
 
 echo "done. Now run $p/configure or $p/configure.developer then make."
 if [ $p != "." ]; then