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 d60d085dcc05d02db068e357d11b73981e2cbda9..cc4000b1488e88cbf50aec3825e1e26d3e2c2477 100644 (file)
--- 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 3739b4d836a6b045ffe8839a24f3e28f5af9e91b..cffaeedc5dd2e8da25114d4986bebe3eb2c9a38a 100644 (file)
--- 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 122e06d9286e0277f936ad0052facd9caf256be8..63e4cf82be3bcce6f08d2f6ac3a5e512b6656f81 100644 (file)
--- 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)