[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[minion-cvs] OpenSSL 0.9.7b4 is out, and seems to work fine, so use ...



Update of /home/minion/cvsroot/src/minion
In directory moria.seul.org:/tmp/cvs-serv12017

Modified Files:
	Makefile 
Log Message:
OpenSSL 0.9.7b4 is out, and seems to work fine, so use it.

Index: Makefile
===================================================================
RCS file: /home/minion/cvsroot/src/minion/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	2 Dec 2002 03:43:15 -0000	1.12
+++ Makefile	2 Dec 2002 05:12:13 -0000	1.13
@@ -87,13 +87,16 @@
 #
 # Targets to make openssl get built properly.  
 #
-OPENSSL_URL = ftp://ftp.openssl.org/source/openssl-0.9.7-beta3.tar.gz
+OPENSSL_URL = ftp://ftp.openssl.org/source/openssl-0.9.7-beta4.tar.gz
+OPENSSL_FILE = openssl-0.9.7-beta4.tar.gz
 
 download-openssl:
-	@if [ -x `which wget 2>&1` ] ; then                               \
+	@if [ -x "`which wget 2>&1`" ] ; then                             \
 	  cd contrib; wget $(OPENSSL_URL);                                \
+        elif [ -x "`which curl 2>&1`" ] ; then                            \
+	  cd contrib; curl -o $(OPENSSL_FILE) $(OPENSSL_URL);             \
 	else                                                              \
-          echo "You don't seem to have wget.  I can't download openssl."; \
+          echo "I can't find wget or curl.  I can't download openssl.";   \
 	fi
 
 destroy-openssl:
@@ -123,13 +126,14 @@
 	         "I'm afraid to delete it." ;                               \
 	    exit;                                                           \
 	fi;                                                                 \
-	TGZ=openssl-*.tar.gz ;                                              \
-	if [ ! -e $$TGZ ]; then                                             \
+	TGZ=`ls openssl-*.tar.gz` ;                                         \
+	if [ "x$$TGZ" = "x" ]; then                                         \
 	    echo "I didn't find any openssl-*.tar.gz in ./contrib/";        \
+	    echo "Try 'make download-openssl'.";                            \
 	    exit;                                                           \
 	fi;                                                                 \
 	for n in $$TGZ; do                                                  \
-	    if [ $$n != $$TGZ ]; then                                       \
+	    if [ $$n != "$$TGZ" ]; then                                     \
 	        echo "Found more than one openssl-*.tar.gz in ./contrib/";  \
 	        echo "(Remove all but the most recent.)";                   \
 		exit;                                                       \