diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-04-10 10:58:27 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-04-10 11:15:17 +0200 |
| commit | 5beaef7cde3c311e4543abf71e5fe9794d62cc6e (patch) | |
| tree | 4be165e22328f91644a671837b591ea93124cf7e | |
| parent | 61d3ba04b497011b933564cc4566239a91e4bf67 (diff) | |
| download | samba-5beaef7cde3c311e4543abf71e5fe9794d62cc6e.tar.gz samba-5beaef7cde3c311e4543abf71e5fe9794d62cc6e.tar.bz2 samba-5beaef7cde3c311e4543abf71e5fe9794d62cc6e.zip | |
s4:autogen-waf: generate 'Makefile' instead of 'makefile'
This hopefully fixes the build on MacOS 10.
metze
| -rw-r--r-- | buildtools/scripts/Makefile.waf | 7 | ||||
| -rwxr-xr-x | source4/autogen-waf.sh | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/buildtools/scripts/Makefile.waf b/buildtools/scripts/Makefile.waf index 78cd0e1e73..a1c4b69525 100644 --- 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 a3aa979f51..7a6e94c5ec 100755 --- 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 |