summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/CREDITS1
-rwxr-xr-xtools/rockboxdev.sh5
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index a162e21..1c400b3 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -313,6 +313,7 @@ Charles Voelger
Gerritt Gonzales
Dieter Pellkofer
Evgeniy Kachalin
+Lenny Koepsell
The libmad team
The wavpack team
The ffmpeg team
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 7bfd784..a927afe 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -23,6 +23,11 @@ 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"