generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change fips build default install location so it doesn't overwrite any

Browse Source 
existing OpenSSL installation.
This commit is contained in:
Dr. Stephen Henson
2007-07-21 00:14:02 +00:00
parent 100868d1cf
commit b01e8b2063
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Configure
View File

@@ -564,7 +564,7 @@ my $prefix="";
my $openssldir=""; my $openssldir="";
my $exe_ext=""; my $exe_ext="";
my $install_prefix=""; my $install_prefix="";
my $fipslibdir="/usr/local/ssl/lib/"; my $fipslibdir="/usr/local/ssl/lib/fips-1.0/";
my $nofipscanistercheck=0; my $nofipscanistercheck=0;
my $fipsdso=0; my $fipsdso=0;
my $fipscanisterinternal="n"; my $fipscanisterinternal="n";
@@ -968,7 +968,17 @@ $no_shared = 0 if ($fipsdso && !$IsMK1MF);
$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target eq "mingw"); $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target eq "mingw");
$exe_ext=".pm" if ($target =~ /vos/); $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-1.0";
}
else
{
$openssldir="/usr/local/ssl";
}
}
$prefix=$openssldir if $prefix eq ""; $prefix=$openssldir if $prefix eq "";
$default_ranlib= &which("ranlib") or $default_ranlib="true"; $default_ranlib= &which("ranlib") or $default_ranlib="true";