From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 29 Jan 2011 23:05:15 +0000 (+0000)
Subject: use different default fips install directory
X-Git-Tag: OpenSSL-fips-2_0-rc1~824
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0c02a3754847d2aa6756b502daefcb01386e58dd;p=oweals%2Fopenssl.git

use different default fips install directory
---

diff --git a/Configure b/Configure
index f5dea0f2cf..aca444a57d 100755
--- a/Configure
+++ b/Configure
@@ -1086,7 +1086,17 @@ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
 $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/);
 $exe_ext=".nlm" if ($target =~ /netware/);
 $exe_ext=".pm"  if ($target =~ /vos/);
-$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
+if ($openssldir eq "" and $prefix eq "")
+	{
+	if ($fips)
+		{
+		$openssldir="/usr/local/ssl/fips-2.0";
+		}
+	else
+		{
+		$openssldir="/usr/local/ssl";
+		}
+	}
 $prefix=$openssldir if $prefix eq "";
 
 $default_ranlib= &which("ranlib") or $default_ranlib="true";