diff options
author | Andy Polyakov <appro@openssl.org> | 2009-12-29 10:46:46 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2009-12-29 10:46:46 +0000 |
commit | b26c45b0338f88c21a2f3a6c4c4e7cb53351606c (patch) | |
tree | 0ead6d85a7c372c03cc65720e46c346348084fba /Configure | |
parent | 986093affa9a1c94de156b5e18d0b7151af62b62 (diff) |
Deploy multilib config-line parameter [from HEAD].
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -1041,8 +1041,6 @@ $exe_ext=".pm" if ($target =~ /vos/); $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); $prefix=$openssldir if $prefix eq ""; -$libdir="lib" if $libdir eq ""; - $default_ranlib= &which("ranlib") or $default_ranlib="true"; $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl") or $perl="perl"; @@ -1095,6 +1093,8 @@ my $ar = $ENV{'AR'} || "ar"; my $arflags = $fields[$idx_arflags]; my $multilib = $fields[$idx_multilib]; +$libdir="lib$multilib" if $libdir eq ""; + $cflags = "$cflags$exp_cflags"; # '%' in $lflags is used to split flags to "pre-" and post-flags @@ -1673,10 +1673,7 @@ while (<IN>) } elsif (/^#define\s+ENGINESDIR/) { - # $foo is to become "$prefix/lib$multilib/engines"; - # as Makefile.org and engines/Makefile are adapted for - # $multilib suffix. - my $foo = "$prefix/lib/engines"; + my $foo = "$prefix/$libdir/engines"; $foo =~ s/\\/\\\\/g; print OUT "#define ENGINESDIR \"$foo\"\n"; } |