*** empty log message ***

[citadel.git] / citadel / newinstall.sh

diff --git a/citadel/newinstall.sh b/citadel/newinstall.sh
index 66fd54517956c1642a237fbd55432d87f8795c88..1770a7279632a89b49a40dc661952471f927ffe9 100644 (file)
--- 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`