generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Real Bourne shell doesn't accept ! as in "if ! grep ..." Fix this in

Browse Source 
crypto/Makefile and make Makefile.org and fips/Makefile more discreet.
This commit is contained in:
Andy Polyakov 2005-03-15 09:46:14 +00:00
parent 6286bbecef
commit b43b9de9e4
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.org
View File

@ -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

5
crypto/Makefile
View File

@ -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:

5
fips/Makefile
View File

@ -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)