[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[minion-cvs] Now I remember why shell bugs me.
Update of /home/minion/cvsroot/src/minion
In directory moria.seul.org:/tmp/cvs-serv12860
Modified Files:
Makefile
Log Message:
Now I remember why shell bugs me.
Index: Makefile
===================================================================
RCS file: /home/minion/cvsroot/src/minion/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 25 Aug 2002 03:48:47 -0000 1.5
+++ Makefile 25 Aug 2002 04:04:49 -0000 1.6
@@ -17,8 +17,10 @@
python2.0x python2 python
FINDPYTHON = \
for n in $(PYTHON_CANDIDATES) ; do \
- if [ 'x' = "x$$PYTHON" -a -x `which $$n` ]; then \
+ if [ 'x' = "x$$PYTHON" ]; then \
+ if [ -x `which $$n 2>&1` ]; then \
PYTHON=$$n; \
+ fi; \
fi ; \
done ; \
if [ 'x' = "x$$PYTHON" ]; then \
@@ -27,7 +29,7 @@
echo ' environment variable'; \
exit; \
fi; \
- if [ 'x' = `$$PYTHON -V 2>&1 | grep 'Python [23456789]'`x ]; then \
+ if [ 'x' = "`$$PYTHON -V 2>&1 | grep 'Python [23456789]'`x" ]; then \
echo "WARNING: $$PYTHON doesn't seem to be version 2 or later."; \
echo ' If this fails, please set the PYTHON environment variable.';\
fi
@@ -86,9 +88,9 @@
OPENSSL_URL = http://www.openssl.org/source/openssl/openssl-0.9.7-beta3.tar.gz
download-openssl:
- @if [ -x `which wget` ] ; then \
- cd contrib; wget $(OPENSSL_URL); \
- else; \
+ @if [ -x `which wget 2>&1` ] ; then \
+ cd contrib; wget $(OPENSSL_URL); \
+ else \
echo "You don't seem to have wget. I can't download openssl."; \
fi
@@ -101,7 +103,7 @@
./contrib/openssl/libcrypto.a: ./contrib/openssl/config
cd ./contrib/openssl; \
./config; \
- make libcrypto.a libssl.a
+ make
./contrib/openssl/config:
$(MAKE) unpack-openssl