diff options
| -rwxr-xr-x | crawl-ref/dolinks.sh | 2 | ||||
| -rwxr-xr-x | crawl-ref/domake.sh | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/dolinks.sh b/crawl-ref/dolinks.sh index e4a023d76c..072555e7bc 100755 --- a/crawl-ref/dolinks.sh +++ b/crawl-ref/dolinks.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash mkdir -p NORMAL mkdir -p WIZARD 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 |