From ee61057ceabd8b2b69a5e733d27caae2adece6cf Mon Sep 17 00:00:00 2001
From: Jonas Häggqvist <rasher@rasher.dk>
Date: Wed, 22 Nov 2006 09:07:45 +0000
Subject: Use gmake rather than make, if available. Patch FS#6340 by Lutz
 Böhne
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11571 a1c6a512-1295-4272-9138-f99709370657
---
 docs/CREDITS        |  1 +
 tools/rockboxdev.sh | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/CREDITS b/docs/CREDITS
index bd52d6a105..b87ac32463 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -249,3 +249,4 @@ Andre Smith
 Travis Hyyppa
 Ian Webber
 Pavel Gnelitsa
+Lutz Böhne
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 0fe4cbe10e..debf12cc34 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -14,8 +14,21 @@ prefix="/usr/local"
 # must not exist before this script is invoked (as a security measure).
 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
+    make="gmake"
+else
+    make="make"
+fi
+
+# If detection fails, override the value of make manually:
+# make="make"
+
 ##############################################################################
 
+
 findtool(){
   file="$1"
 
@@ -201,9 +214,9 @@ cd build-binu
 echo "ROCKBOXDEV: binutils/configure"
 ../binutils-$binutils/configure --target=$target --prefix=$prefix/$target
 echo "ROCKBOXDEV: binutils/make"
-make
+$make
 echo "ROCKBOXDEV: binutils/make install to $prefix/$target"
-make install
+$make install
 cd .. # get out of build-binu
 PATH="${PATH}:$bindir"
 SHELL=/bin/sh # seems to be needed by the gcc build in some cases
@@ -215,9 +228,9 @@ cd build-gcc
 echo "ROCKBOXDEV: gcc/configure"
 ../gcc-$gccver/configure --target=$target --prefix=$prefix/$target --enable-languages=c
 echo "ROCKBOXDEV: gcc/make"
-make
+$make
 echo "ROCKBOXDEV: gcc/make install to $prefix/$target"
-make install
+$make install
 cd .. # get out of build-gcc
 cd .. # get out of $builddir
 
-- 
cgit