* Easy Install requires gmake

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3c075a6498beaf2fdf2d20d15a0eff90808577d6..7d417c34f093506b65a101b5c1b713e28fb2cd46 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -6764,4 +6764,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/newinstall.sh b/citadel/newinstall.sh
index c14160fbfa1b2c5f9bbd80f725d4ab1ed57e1eb1..66fd54517956c1642a237fbd55432d87f8795c88 100644 (file)
--- a/citadel/newinstall.sh
+++ b/citadel/newinstall.sh
@@ -336,7 +336,7 @@ do_config () {
 # 1. Gather information about the target system
 
 [ -n "$MAKE" ] && [ -x `which gmake` ] && MAKE=`which gmake`
-[ -z "$MAKE" ] && [ -x `which make` ] && MAKE=`which make`
+##### FIXME: non-GNU make does not work #####[ -z "$MAKE" ] && [ -x `which make` ] && MAKE=`which make`
 clear
 
 os=`uname`
@@ -349,6 +349,7 @@ os=`uname`
 
 echo MAKE is $MAKE
 echo WGET is $WGET 
+export MAKE WGET
 
 # 1A. Do we use the native packaging system or build our own copy of Citadel?