From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 9 Jun 2011 21:52:44 +0000 (+0000)
Subject: Install FIPS module in FIPSDIR if set.
X-Git-Tag: OpenSSL-fips-2_0-rc1~331
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=a1a8a71cf74745e4d8d9501a64a5da30ebd3befc

Install FIPS module in FIPSDIR if set.
---

diff --git a/Configure b/Configure
index a8b3b35e80..4705a54063 100755
--- a/Configure
+++ b/Configure
@@ -1148,7 +1148,14 @@ if ($openssldir eq "" and $prefix eq "")
 	{
 	if ($fips)
 		{
-		$openssldir="/usr/local/ssl/fips-2.0";
+		if (exists $ENV{FIPSDIR})
+			{
+			$openssldir="$ENV{FIPSDIR}";
+			}
+		else
+			{
+			$openssldir="/usr/local/ssl/fips-2.0";
+			}
 		}
 	else
 		{