diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-09-29 16:57:05 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-09-29 16:57:05 -0700 |
| commit | 202894053825ef4275bb492636b0155f84b0a363 (patch) | |
| tree | cf9f1d28623a516a8157683bb9af1accf4b31f0e /crawl-ref/domake.sh | |
| parent | 9f5ffcc6793afe30119408291a482c2a78133fe4 (diff) | |
| download | crawl-ref-202894053825ef4275bb492636b0155f84b0a363.tar.gz crawl-ref-202894053825ef4275bb492636b0155f84b0a363.zip | |
domake & dolinks: use BASH shell and GNU make
FreeBSD's /bin/sh doesn't understand pushd/popd.
FreeBSD's 'make' is BSD make. Use gmake instead.
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/domake.sh')
| -rwxr-xr-x | crawl-ref/domake.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/domake.sh b/crawl-ref/domake.sh index 4ae1a8d6fe..f129f6a14e 100755 --- a/crawl-ref/domake.sh +++ b/crawl-ref/domake.sh @@ -1,9 +1,14 @@ -#!/bin/sh +#!/usr/bin/env bash #jmf: automate making normal & wizard binaries, until they merge #jmf: N.B.: requires symlink directories; run ./dolinks.sh to make -pushd NORMAL/source ; make ; popd -pushd WIZARD/source ; make wizard ; popd +MAKE=make +if [ "$(uname -s)" == "FreeBSD" ]; then + MAKE=gmake +fi + +pushd NORMAL/source ; $MAKE ; popd +pushd WIZARD/source ; $MAKE wizard ; popd if [ -f NORMAL/source/crawl ]; then ln -sf NORMAL/source/crawl ncrawl |