diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-03-15 09:46:14 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-03-15 09:46:14 +0000 |
| commit | b43b9de9e4b09b91d0530358c7c9600c9ecbccd1 (patch) | |
| tree | 50d84e7b5a086f3dc0f225f3c13cc6784fb1e55f | |
| parent | 6286bbecef8a6cde23f99705148fb77e47c1ad22 (diff) | |
Real Bourne shell doesn't accept ! as in "if ! grep ..." Fix this in
crypto/Makefile and make Makefile.org and fips/Makefile more discreet.
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | crypto/Makefile | 5 | ||||
| -rw-r--r-- | fips/Makefile | 5 |
3 files changed, 7 insertions, 5 deletions
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) |