summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2007-08-13 00:43:01 +0000
committerBarry Wardell <rockbox@barrywardell.net>2007-08-13 00:43:01 +0000
commit121af38deeac602be91ed658d4afae8ef90cce75 (patch)
tree641e2a335cb1dea4cadaa40611d201490eaaa0bb /tools
parent7c371f6a8c2d7961933bd7d0ca0bf954d9eea66b (diff)
downloadrockbox-121af38deeac602be91ed658d4afae8ef90cce75.tar.gz
rockbox-121af38deeac602be91ed658d4afae8ef90cce75.tar.bz2
rockbox-121af38deeac602be91ed658d4afae8ef90cce75.zip
Simpler fix for rockboxdev.sh make/gmake detection in Mac OS X/Darwin.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14307 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-xtools/rockboxdev.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index a927afef99..e33b21c289 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -17,17 +17,12 @@ builddir="$HOME/build-rbdev"
# This script needs to use GNU Make. On Linux systems, GNU Make is invoked
# by running the "make" command, on most BSD systems, GNU Make is invoked
# by running the "gmake" command. Set the "make" variable accordingly.
-if [ -n "`which gmake`" ]; then
+if [ -f "`which gmake`" ]; then
make="gmake"
else
make="make"
fi
-# Alternate detection for Mac OS X/Darwin
-if [ "`uname`" == "Darwin" ] && which gmake | grep -q '^no'; then
- make="make"
-fi
-
# If detection fails, override the value of make manually:
# make="make"