From: Andy Polyakov <appro@openssl.org>
Date: Tue, 29 Dec 2009 10:46:46 +0000 (+0000)
Subject: Deploy multilib config-line parameter [from HEAD].
X-Git-Tag: OpenSSL_1_0_0-beta5~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b26c45b0338f88c21a2f3a6c4c4e7cb53351606c;p=oweals%2Fopenssl.git

Deploy multilib config-line parameter [from HEAD].
---

diff --git a/Configure b/Configure
index 21617ba917..62857627f3 100755
--- a/Configure
+++ b/Configure
@@ -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";
 		}