Synched gist at Fri Mar 8 07:57:07 PST 2024

freehlded-bootstrap.sh

@@ -82,25 +82,34 @@ check_pak()
 # dependencies: rewise
 if [ ! -f ./rewise ]
 then
-	# detect if we have gmake, and the right version too.
-	if [ -x "$(command -v gmake)" ]
-	then
-		MAKEVER=$(gmake --version | awk '{ print $1 }' | head -n 1)
+	# check our make command version
+	MAKEVER=$(make --version | awk '{ print $1 }' | head -n 1)
 
-		if [ "$MAKEVER" = "GNU" ]
+	# check if it is GNU.
+	if [ "$MAKEVER" = "GNU" ]
+	then
+		MAKETOOL="make"
+	else
+		# guess not, do we have gmake?
+		if [ -x "$(command -v gmake)" ]
 		then
-			MAKETOOL="gmake"
+			MAKEVER=$(gmake --version | awk '{ print $1 }' | head -n 1)
+
+			if [ "$MAKEVER" = "GNU" ]
+			then
+				MAKETOOL="gmake"
+			else
+				# this should never happen
+				echo "Installed gmake is not GNU Make."
+				exit 2
+			fi
 		else
+			# our make isn't GNU, and gmake isn't available (most default BSDs)
 			echo "Please install GNU Make."
 			exit 2
 		fi
 	fi
 
-	if [ -z "$MAKETOOL" ]
-	then
-		MAKETOOL=make
-	fi
-
 	BINDIR="$(pwd)"
 	git clone https://vcs.vera-visions.com/eukara/REWise
 	cd REWise