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

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 82f25cd7f35fa2bb0f2020802a4e31e346970c6b..e9d11fd2b5a45a141a3afbba7aaf7e524817f8f9 100755 (executable)
--- 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
@@ -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";
                }