Commit 6a9d28f9 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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.
parent 3fc2efd2

Configure

+3 −6
Original line number Diff line number Diff line
@@ -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";

		}