From 202894053825ef4275bb492636b0155f84b0a363 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Tue, 29 Sep 2009 16:57:05 -0700
Subject: 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>
---
 crawl-ref/domake.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'crawl-ref/domake.sh')

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
-- 
cgit v1.2.3-54-g00ecf