From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 25 Jan 2007 21:29:07 +0000 (+0000)
Subject: Fixes to build system to cleanly handle fipsdso
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=613f1c7e91c6e80813e182732d301b2c8b977691;p=oweals%2Fopenssl.git

Fixes to build system to cleanly handle fipsdso
---

diff --git a/fips-1.0/Makefile b/fips-1.0/Makefile
index c6812e6455..da156514da 100644
--- a/fips-1.0/Makefile
+++ b/fips-1.0/Makefile
@@ -137,7 +137,7 @@ lib:	$(FIPSCANLOC) delexobj
 	@touch lib
 
 shared:	fips_premain_dso$(EXE_EXT)
-	if [ -n "$(SHARED_LIBS)" ]; then \
+	if [ -n "$(SHARED_LIBS)" -a "$(FIPSCANLIB)" != "libfips" ]; then \
 		(cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips-1.0/fipsld $(SHARED_LIB)); \
 	fi
 
diff --git a/fips-1.0/fipsld b/fips-1.0/fipsld
index 3db6fc3fb7..d5fd785fab 100755
--- a/fips-1.0/fipsld
+++ b/fips-1.0/fipsld
@@ -64,7 +64,7 @@ case "${TARGET}" in
 esac
 
 case "${TARGET}" in
-*${FIPCANLIB}*|*.dll)	# must be linking a shared lib...
+*${FIPSCANLIB}*|*.dll)	# must be linking a shared lib...
 	# Shared lib creation can be taking place in the source
 	# directory only!!!
 	FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"