use different default fips install directory
authorDr. Stephen Henson <steve@openssl.org>
Sat, 29 Jan 2011 23:05:15 +0000 (23:05 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 29 Jan 2011 23:05:15 +0000 (23:05 +0000)
Configure

index f5dea0f..aca444a 100755 (executable)
--- 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";