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

Deploy multilib config-line parameter. It was added in February to allow

Browse Source 
for kind of installation suggested in ticket #2003 from August. What it
effectively does now, is arrange pre-configured default $libdir value.
Note that it also fixes ENGINESDIR, i.e. harmonizes it with install path.
This commit is contained in:
Andy Polyakov 2009-12-29 10:33:37 +00:00
parent 3fc2efd241
commit 6a9d28f9e4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Configure
View File

@ -1041,8 +1041,6 @@ $exe_ext=".pm" if ($target =~ /vos/);
$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
$prefix=$openssldir if $prefix eq ""; $prefix=$openssldir if $prefix eq "";
$libdir="lib" if $libdir eq "";
$default_ranlib= &which("ranlib") or $default_ranlib="true"; $default_ranlib= &which("ranlib") or $default_ranlib="true";
$perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl") $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")
or $perl="perl"; or $perl="perl";
@ -1095,6 +1093,8 @@ my $ar = $ENV{'AR'} || "ar";
my $arflags = $fields[$idx_arflags]; my $arflags = $fields[$idx_arflags];
my $multilib = $fields[$idx_multilib]; my $multilib = $fields[$idx_multilib];
$libdir="lib$multilib" if $libdir eq "";
$cflags = "$cflags$exp_cflags"; $cflags = "$cflags$exp_cflags";
# '%' in $lflags is used to split flags to "pre-" and post-flags # '%' in $lflags is used to split flags to "pre-" and post-flags
@ -1674,10 +1674,7 @@ while (<IN>)
} }
elsif (/^#define\s+ENGINESDIR/) elsif (/^#define\s+ENGINESDIR/)
{ {
# $foo is to become "$prefix/lib$multilib/engines"; my $foo = "$prefix/$libdir/engines";
# as Makefile.org and engines/Makefile are adapted for
# $multilib suffix.
my $foo = "$prefix/lib/engines";
$foo =~ s/\\/\\\\/g; $foo =~ s/\\/\\\\/g;
print OUT "#define ENGINESDIR \"$foo\"\n"; print OUT "#define ENGINESDIR \"$foo\"\n";
} }