diff --git a/tools/make-all b/tools/make-all
deleted file mode 100755
index 0020102d0..000000000
--- a/tools/make-all
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-PROJECTS="libusb libconn libbtstack libadb bootloader device_bootloader app_layer_v1 blink latency_tester"
-
-if [[ -z "$MAKE" ]] && which colormake > /dev/null 2>&1 ; then
-   MAKE=colormake
-else
-   MAKE=make     
-fi
-
-if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-  PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh
-else
-  PRJMAKEFILEGENERATOR=prjMakefilesGenerator.bat
-fi
-
-for PROJ in $PROJECTS; do
-  echo ===========================================
-  echo $PROJ
-  echo ===========================================
-  if ! $PRJMAKEFILEGENERATOR firmware/$PROJ; then echo "WARNING: failed to regenerate Makefiles."; fi
-  if ! $MAKE -C firmware/$PROJ "$@"; then echo FAILURE ; exit 1 ; fi
-done
-echo SUCCESS
-
diff --git a/tools/make-all.sh b/tools/make-all.sh
new file mode 100755
index 000000000..78384ce19
--- /dev/null
+++ b/tools/make-all.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+PROJECTS="libusb libconn libbtstack libadb bootloader device_bootloader app_layer_v1 blink latency_tester"
+
+if [[ -z "$MAKE" ]] && which colormake > /dev/null 2>&1 ; then
+   MAKE=colormake
+else
+   MAKE=make     
+fi
+
+unameOut="$(uname -s)"
+case "${unameOut}" in
+    Linux*)     PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;;
+    Darwin*)    PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;;
+    CYGWIN*)    PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;;
+    //MINGW*)   PRJMAKEFILEGENERATOR=prjMakefilesGenerator.sh;;
+    *)          PRJMAKEFILEGENERATOR=prjMakefilesGenerator.bat
+esac
+
+echo PRJMAKEFILEGENERATOR=$PRJMAKEFILEGENERATOR
+
+for PROJ in $PROJECTS; do
+  echo ===========================================
+  echo "$PROJ"
+  echo ===========================================
+  if ! $PRJMAKEFILEGENERATOR firmware/"$PROJ"; then echo "WARNING: failed to regenerate Makefiles."; fi
+  if ! $MAKE -C firmware/"$PROJ" "$@"; then echo FAILURE ; exit 1 ; fi
+done
+echo SUCCESS
+