From: Michael Hampton <io_error@uncensored.citadel.org>
Date: Sun, 29 Aug 2004 15:18:42 +0000 (+0000)
Subject: * newinstall.sh: fix detection of gmake/make
X-Git-Tag: v7.86~5286
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=9ed15b6d68fd831077ff94a9530efcc337f3d8dd;p=citadel.git

* newinstall.sh: fix detection of gmake/make
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3de013abc..4c6232b74 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 625.5  2004/08/29 15:18:41  error
+ * newinstall.sh: fix detection of gmake/make
+
  Revision 625.4  2004/08/28 14:21:25  error
  * Change the logging level of some messages and add a couple of new ones to
    show when a network node is connecting.
@@ -6015,3 +6018,4 @@ 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 d21b56078..fecac1d72 100644
--- a/citadel/newinstall.sh
+++ b/citadel/newinstall.sh
@@ -300,8 +300,8 @@ do_config () {
 
 # 1. Gather information about the target system
 
-[ x$MAKE == x ] && MAKE=`which gmake`
-[ x$MAKE == x ] && MAKE=`which make`
+[ -n $MAKE ] && MAKE=`which gmake 2>/dev/null`
+[ -n $MAKE ] && MAKE=`which make 2>/dev/null`
 clear
 
 os=`uname`