Fix #5113 - Improve building portability

22 files changed, 28 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index fe2f89c606..83acdf5ee2 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,8 @@ CONFIG_MAKE=$(top_srcdir)/config.make
 	case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
 	for dir in $(SUBDIRS); do \
 		case $$dir in \
-		.) make $*-local || { final_exit="exit 1"; $$dk; };;\
-		*) (cd $$dir && make $*) || { final_exit="exit 1"; $$dk; };;\
+		.) $(MAKE) $*-local || { final_exit="exit 1"; $$dk; };;\
+		*) (cd $$dir && $(MAKE) $*) || { final_exit="exit 1"; $$dk; };;\
 		esac \
 	done
 	$$final_exit
@@ -76,19 +76,19 @@ dist: update_submodules remove-stale-tarballs dist-recursive
 	@cd tarballs && rm -rf monodevelop-$(PACKAGE_VERSION)
 
 run:
-	cd main && make run
+	cd main && $(MAKE) run
 
 run-gdb:
-	cd main && make run-gdb
+	cd main && $(MAKE) run-gdb
 
 test:
-	cd main/tests/UnitTests && make test fixture=$(fixture)
+	cd main/tests/UnitTests && $(MAKE) test fixture=$(fixture)
 
 check-addins:
-	cd main && make check-addins
+	cd main && $(MAKE) check-addins
 
 app-dir:
-	cd main && make app-dir
+	cd main && $(MAKE) app-dir
 
 reset-versions: reset-all
 check-versions: check-all
diff --git a/configure b/configure
index 3a5f370109..3d1775ec47 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=2.1.0
 profile=default
 tests=no
diff --git a/extras/AspNetEdit/configure b/extras/AspNetEdit/configure
index eb93823683..3b041d478a 100755
--- a/extras/AspNetEdit/configure
+++ b/extras/AspNetEdit/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.1.0
 PACKAGE=aspnetedit
 prefix=/usr/local
diff --git a/extras/GeckoWebBrowser/configure b/extras/GeckoWebBrowser/configure
index 1f8fcdc4d6..dda8a69ecc 100755
--- a/extras/GeckoWebBrowser/configure
+++ b/extras/GeckoWebBrowser/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.1.0
 PACKAGE=geckowebbrowser
 prefix=/usr/local
diff --git a/extras/JavaBinding/configure b/extras/JavaBinding/configure
index c80d16a73d..569a7c980a 100755
--- a/extras/JavaBinding/configure
+++ b/extras/JavaBinding/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.1.0
 PACKAGE=monodevelop-java
 prefix=/usr/local
diff --git a/extras/MonoDevelop.AddinAuthoring/configure b/extras/MonoDevelop.AddinAuthoring/configure
index 6f117a31ff..a385812f65 100755
--- a/extras/MonoDevelop.AddinAuthoring/configure
+++ b/extras/MonoDevelop.AddinAuthoring/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.1.0
 PACKAGE=monodevelop_addinauthoring
 prefix=/usr/local
diff --git a/extras/MonoDevelop.Debugger.Gdb/configure b/extras/MonoDevelop.Debugger.Gdb/configure
index e212890256..dc70431d35 100755
--- a/extras/MonoDevelop.Debugger.Gdb/configure
+++ b/extras/MonoDevelop.Debugger.Gdb/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.1.0
 PACKAGE=monodevelop-debugger-gdb
 prefix=/usr/local
diff --git a/extras/MonoDevelop.Debugger.Mdb/configure b/extras/MonoDevelop.Debugger.Mdb/configure
index 0647317cb2..878fe6a2e6 100755
--- a/extras/MonoDevelop.Debugger.Mdb/configure
+++ b/extras/MonoDevelop.Debugger.Mdb/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.1.0
 PACKAGE=monodevelop-debugger-mdb
 prefix=/usr/local
diff --git a/extras/MonoDevelop.MeeGo/configure b/extras/MonoDevelop.MeeGo/configure
index cd65795ed5..048fbcfc27 100755
--- a/extras/MonoDevelop.MeeGo/configure
+++ b/extras/MonoDevelop.MeeGo/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 prefix=/usr/local
 common_packages=" mono-addins;0.3 monodevelop;3.1.0 monodevelop-core-addins;2.7"
 
diff --git a/extras/MonoDevelop.MonoMac/configure b/extras/MonoDevelop.MonoMac/configure
index cd65795ed5..048fbcfc27 100755
--- a/extras/MonoDevelop.MonoMac/configure
+++ b/extras/MonoDevelop.MonoMac/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 prefix=/usr/local
 common_packages=" mono-addins;0.3 monodevelop;3.1.0 monodevelop-core-addins;2.7"
 
diff --git a/extras/PyBinding/configure b/extras/PyBinding/configure
index b45a664c16..8280ad0475 100755
--- a/extras/PyBinding/configure
+++ b/extras/PyBinding/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.1.0
 PACKAGE=monodevelop-python
 prefix=/usr/local
diff --git a/extras/WebKitWebBrowser/configure b/extras/WebKitWebBrowser/configure
index ab35cdee4e..aea2ffad7e 100755
--- a/extras/WebKitWebBrowser/configure
+++ b/extras/WebKitWebBrowser/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=3.1.0
 PACKAGE=webkitwebbrowser
 prefix=/usr/local
diff --git a/main/build/MacOSX/make-dmg-bundle.sh b/main/build/MacOSX/make-dmg-bundle.sh
index c197f0eeca..25aa075035 100755
--- a/main/build/MacOSX/make-dmg-bundle.sh
+++ b/main/build/MacOSX/make-dmg-bundle.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Shamelessly lifted from Banshee's build process
  	
diff --git a/main/contrib/extract_makefile_variable.sh b/main/contrib/extract_makefile_variable.sh
index b2e0ca8ab2..4bfde712ea 100644
--- a/main/contrib/extract_makefile_variable.sh
+++ b/main/contrib/extract_makefile_variable.sh
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 sed -e :a -e '/\\$/N; s/\\\n//; ta' -e "/^$2/!d" -e "s/$2 = //" $1
diff --git a/main/mdtool.in b/main/mdtool.in
index a6fec1831a..614f0b3943 100644
--- a/main/mdtool.in
+++ b/main/mdtool.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #this script should be in $PREFIX/bin
 MONO_EXEC="exec -a mdtool mono"
diff --git a/main/monodevelop.in b/main/monodevelop.in
index 78490549d5..cc164681fb 100755
--- a/main/monodevelop.in
+++ b/main/monodevelop.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #Workaround for Unity gnome shell
 export UBUNTU_MENUPROXY=0
diff --git a/main/src/addins/MonoDevelop.Autotools/templates/configure.template b/main/src/addins/MonoDevelop.Autotools/templates/configure.template
index 8501f2a8de..63f91cc14b 100644
--- a/main/src/addins/MonoDevelop.Autotools/templates/configure.template
+++ b/main/src/addins/MonoDevelop.Autotools/templates/configure.template
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=%%VERSION%%
 PACKAGE=%%PACKAGE%%
 prefix=/usr/local
diff --git a/main/tests/test-projects/console-project-with-makefile/configure b/main/tests/test-projects/console-project-with-makefile/configure
index 7130dda753..cb02cf647e 100755
--- a/main/tests/test-projects/console-project-with-makefile/configure
+++ b/main/tests/test-projects/console-project-with-makefile/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 VERSION=0.1
 PACKAGE=consoleproject
 prefix=/usr/local
diff --git a/main/theme-icons/icon-theme-installer b/main/theme-icons/icon-theme-installer
index 328cf736ca..ca5d226981 100755
--- a/main/theme-icons/icon-theme-installer
+++ b/main/theme-icons/icon-theme-installer
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # icon-theme-installer
 # Copyright (C) 2006 Novell, Inc.
diff --git a/scripts/mdbranch b/scripts/mdbranch
index 0dfaeecf3b..d32f7f4497 100755
--- a/scripts/mdbranch
+++ b/scripts/mdbranch
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 version=1.9
 prefix=/usr/local
 profile=dist
diff --git a/scripts/mdget b/scripts/mdget
index 8c6f6e6408..ff4f3b59bc 100755
--- a/scripts/mdget
+++ b/scripts/mdget
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 version=
 prefix=/usr/local
 profile=stable
diff --git a/scripts/mdtag b/scripts/mdtag
index 4fb8fa24e6..a574f46ec4 100755
--- a/scripts/mdtag
+++ b/scripts/mdtag
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 usage ()
 {