diff options
author | Barry Wardell <rockbox@barrywardell.net> | 2007-08-13 00:10:00 +0000 |
---|---|---|
committer | Barry Wardell <rockbox@barrywardell.net> | 2007-08-13 00:10:00 +0000 |
commit | 7c371f6a8c2d7961933bd7d0ca0bf954d9eea66b (patch) | |
tree | 6c53faa0c5d937638d830b9d5049c4622c8c6821 | |
parent | 4a934ac91f3777e8bf27b71bf4d0850e882eca92 (diff) | |
download | rockbox-7c371f6a8c2d7961933bd7d0ca0bf954d9eea66b.tar.gz rockbox-7c371f6a8c2d7961933bd7d0ca0bf954d9eea66b.zip |
Accept FS#6499 - fix rockboxdev.sh make/gmake detection in Mac OS X/Darwin. Thanks to Lenny Koepsell.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14306 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rwxr-xr-x | tools/rockboxdev.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/CREDITS b/docs/CREDITS index a162e21262..1c400b30b3 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -313,6 +313,7 @@ Charles Voelger | |||
313 | Gerritt Gonzales | 313 | Gerritt Gonzales |
314 | Dieter Pellkofer | 314 | Dieter Pellkofer |
315 | Evgeniy Kachalin | 315 | Evgeniy Kachalin |
316 | Lenny Koepsell | ||
316 | The libmad team | 317 | The libmad team |
317 | The wavpack team | 318 | The wavpack team |
318 | The ffmpeg team | 319 | The ffmpeg team |
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index 7bfd7840c9..a927afef99 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -23,6 +23,11 @@ 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 | |||
26 | # If detection fails, override the value of make manually: | 31 | # If detection fails, override the value of make manually: |
27 | # make="make" | 32 | # make="make" |
28 | 33 | ||