From c656525866387e36edeb6914d466d52dfb5d70e7 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Fri, 9 Apr 2021 09:30:51 +0000
Subject: build system: configure: added --make and MAKE support.

---
 Makefile.in               |  2 ++
 config.usage              |  4 ++++
 configure                 | 13 ++++++++++++-
 sofort/ccenv/ccenv.sh     |  4 ++--
 sofort/config/config.vars |  3 +++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 925e6a4..87e92df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,6 +36,8 @@ SRCBALL			= @srcball@
 SRCBALL_URL		= @srcball_url@
 SRCBALL_SHA256		= @srcball_sha256@
 
+MAKE                    = @make@
+
 BUILD 			= @build@
 HOST 			= @host@
 CCHOST 			= @cchost@
diff --git a/config.usage b/config.usage
index 5074221..8422fff 100644
--- a/config.usage
+++ b/config.usage
@@ -59,6 +59,8 @@ supported switches:
 	--pdfdir
 	--psdir
 
+	--make
+
 	--build
 	--host
 	--cchost
@@ -124,6 +126,8 @@ supported variables:
 	CPP
 	CXX
 
+	MAKE
+
 	BUILD
 	HOST
 	CCHOST
diff --git a/configure b/configure
index 62c2b11..2240589 100755
--- a/configure
+++ b/configure
@@ -211,6 +211,8 @@ init_vars()
 	mb_pdfdir=$PDFDIR
 	mb_psdir=$PSDIR
 
+	# make
+	mb_make=$MAKE
 
 	# build
 	mb_build=$BUILD
@@ -600,6 +602,11 @@ common_defaults()
 		fi
 	fi
 
+	# make
+	if [ -z "$mb_make" ]; then
+		mb_make='make'
+	fi
+
 	# shell
 	if [ -z "$mb_shell" ]; then
 		mb_shell='/bin/sh'
@@ -732,7 +739,7 @@ config_host()
 {
 	output_step_prolog ${mb_script} 'config_host'
 
-	make -s host.tag             \
+	${mb_make} -s host.tag       \
 		&& output_step_epilog \
 		&& return 0
 
@@ -887,6 +894,10 @@ for arg ; do
 			mb_psdir=${arg#*=}
 			;;
 
+		#make
+		--make=*)
+			mb_make=${arg#*=}
+			;;
 
 		# build
 		--build=*)
diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh
index 4b91387..5db4a04 100644
--- a/sofort/ccenv/ccenv.sh
+++ b/sofort/ccenv/ccenv.sh
@@ -1369,7 +1369,7 @@ ccenv_common_init()
 
 	if [ $ccenv_cfgtype = 'host' ]; then
 		ccenv_tflags=
-		ccenv_cflags=$(make -s -f "$mb_pwd/Makefile.tmp" .cflags-host)
+		ccenv_cflags=$(${mb_make} -s -f "$mb_pwd/Makefile.tmp" .cflags-host)
 
 		ccenv_cc="$mb_user_cc"
 		ccenv_cpp="$mb_user_cpp"
@@ -1379,7 +1379,7 @@ ccenv_common_init()
 		ccenv_pe_image_base="$mb_pe_image_base"
 	else
 		ccenv_tflags=
-		ccenv_cflags=$(make -s -f "$mb_pwd/Makefile.tmp" .cflags-native)
+		ccenv_cflags=$(${mb_make} -s -f "$mb_pwd/Makefile.tmp" .cflags-native)
 		ccenv_cc="$mb_native_cc"
 		ccenv_cpp="$mb_native_cpp"
 		ccenv_cxx="$mb_native_cxx"
diff --git a/sofort/config/config.vars b/sofort/config/config.vars
index 6f7fbbc..7df24b3 100644
--- a/sofort/config/config.vars
+++ b/sofort/config/config.vars
@@ -37,6 +37,9 @@ srcball
 srcball_url
 srcball_sha256
 
+
+make
+
 build
 host
 cchost
-- 
cgit v1.2.3