diff options
author | Andy Polyakov <appro@openssl.org> | 2009-12-29 10:33:37 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2009-12-29 10:33:37 +0000 |
commit | 6a9d28f9e4b536d53365733672806e914f513493 (patch) | |
tree | 4c3f34a6e50ec38813896c775ef9e9ed4c842333 | |
parent | 3fc2efd241bdded36dbc099d5d8016ed39311753 (diff) |
Deploy multilib config-line parameter. It was added in February to allow
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.
-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 @@ -1674,10 +1674,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"; } |