diff options
author | Barry Wardell <rockbox@barrywardell.net> | 2007-08-13 00:43:01 +0000 |
---|---|---|
committer | Barry Wardell <rockbox@barrywardell.net> | 2007-08-13 00:43:01 +0000 |
commit | 121af38deeac602be91ed658d4afae8ef90cce75 (patch) | |
tree | 641e2a335cb1dea4cadaa40611d201490eaaa0bb /tools | |
parent | 7c371f6a8c2d7961933bd7d0ca0bf954d9eea66b (diff) | |
download | rockbox-121af38deeac602be91ed658d4afae8ef90cce75.tar.gz 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-x | tools/rockboxdev.sh | 7 |
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" | |||
17 | # This script needs to use GNU Make. On Linux systems, GNU Make is invoked | 17 | # This script needs to use GNU Make. On Linux systems, GNU Make is invoked |
18 | # by running the "make" command, on most BSD systems, GNU Make is invoked | 18 | # by running the "make" command, on most BSD systems, GNU Make is invoked |
19 | # by running the "gmake" command. Set the "make" variable accordingly. | 19 | # by running the "gmake" command. Set the "make" variable accordingly. |
20 | if [ -n "`which gmake`" ]; then | 20 | if [ -f "`which gmake`" ]; then |
21 | make="gmake" | 21 | make="gmake" |
22 | else | 22 | else |
23 | make="make" | 23 | make="make" |
24 | fi | 24 | fi |
25 | 25 | ||
26 | # Alternate detection for Mac OS X/Darwin | ||
27 | if [ "`uname`" == "Darwin" ] && which gmake | grep -q '^no'; then | ||
28 | make="make" | ||
29 | fi | ||
30 | |||
31 | # If detection fails, override the value of make manually: | 26 | # If detection fails, override the value of make manually: |
32 | # make="make" | 27 | # make="make" |
33 | 28 | ||