From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 25 Jan 2007 22:05:52 +0000 (+0000)
Subject: Make install option work in fipdso (maybe!).
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7506ac8d2537ecabde5367417c5f6741b01cb904;p=oweals%2Fopenssl.git

Make install option work in fipdso (maybe!).
---

diff --git a/Makefile.org b/Makefile.org
index 114ea5b3fb..53e39b2db6 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -198,7 +198,7 @@ BASEADDR=
 SHLIB_MARK=
 
 DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools
-SHLIBDIRS= crypto ssl
+SHLIBDIRS= crypto ssl fips
 
 # dirs in crypto to build
 SDIRS=  objects \
diff --git a/fips-1.0/Makefile b/fips-1.0/Makefile
index f6fd7410d3..041536d7e8 100644
--- a/fips-1.0/Makefile
+++ b/fips-1.0/Makefile
@@ -133,6 +133,10 @@ links:
 
 lib:	$(FIPSCANLOC) delexobj
 	$(AR) ../$(FIPSCANLIB).a $(FIPSCANLOC)
+	if [ "$(FIPSCANLIB)" == "libfips" ]; then \
+		$(AR) $(LIB) $(FIPSCANLOC) ; \
+		$(RANLIB) $(LIB) || echo Never Mind. ; \
+	fi
 	$(RANLIB) ../$(FIPSCANLIB).a || echo Never mind.
 	@touch lib