From: Andy Polyakov <appro@openssl.org>
Date: Tue, 15 Mar 2005 09:46:14 +0000 (+0000)
Subject: Real Bourne shell doesn't accept ! as in "if ! grep ..." Fix this in
X-Git-Tag: OpenSSL_0_9_7f~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b43b9de9e4b09b91d0530358c7c9600c9ecbccd1;p=oweals%2Fopenssl.git

Real Bourne shell doesn't accept ! as in "if ! grep ..." Fix this in
crypto/Makefile and make Makefile.org and fips/Makefile more discreet.
---

diff --git a/Makefile.org b/Makefile.org
index d60d085dcc..cc4000b148 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -227,7 +227,7 @@ all: Makefile sub_all openssl.pc
 
 sigs:	$(SIGS)
 libcrypto.a.sha1: libcrypto.a
-	if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+	@if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
 		$(RANLIB) libcrypto.a; \
 		fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.a.sha1; \
 	fi
diff --git a/crypto/Makefile b/crypto/Makefile
index 3739b4d836..cffaeedc5d 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -94,10 +94,9 @@ lib:	$(LIBOBJ)
 	@touch lib
 
 shared: buildinf.h lib subdirs
-	if [ -n "$(SHARED_LIBS)" ]; then \
-	    if ! egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+	@if [ -n "$(SHARED_LIBS)" ]; then \
+		egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null || \
 		(cd ..; $(MAKE) $(SHARED_LIB)); \
-	    fi \
 	fi
 
 libs:
diff --git a/fips/Makefile b/fips/Makefile
index 122e06d928..63e4cf82be 100644
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -45,7 +45,10 @@ ALL=    $(GENERAL) $(SRC) $(HEADER)
 top:
 	@(cd ..; $(MAKE) DIRS=$(DIR) all)
 
-all: subdirs lib check shared
+all:
+	@if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+		$(MAKE) -e subdirs check lib shared; \
+	fi
 
 check:
 	TOP=`pwd`/$(TOP) ./fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)