From: Art Cancro <ajc@citadel.org>
Date: Thu, 9 Jun 2005 20:20:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v7.86~4854
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=b7fd7089b67eecfa7afe8434217cbad08ce657be;p=citadel.git

*** empty log message ***
---

diff --git a/citadel/newinstall.sh b/citadel/newinstall.sh
index 66fd54517..1770a7279 100644
--- a/citadel/newinstall.sh
+++ b/citadel/newinstall.sh
@@ -335,8 +335,18 @@ do_config () {
 
 # 1. Gather information about the target system
 
-[ -n "$MAKE" ] && [ -x `which gmake` ] && MAKE=`which gmake`
-##### FIXME: non-GNU make does not work #####[ -z "$MAKE" ] && [ -x `which make` ] && MAKE=`which make`
+# FIXME: non-GNU make does not work
+
+gmake -v || {
+	echo
+	echo 'Easy Install requires GNU Make (gmake), which was not found.'
+	echo 'Please install gmake and try again.'
+	echo
+	exit 1
+}
+MAKE=`which gmake`
+export MAKE
+
 clear
 
 os=`uname`