blob: 8a3407f15728e66a7da6307ee62894484be61855 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
diff -dubr source/Configure dir/Configure
--- source/Configure 2012-03-15 02:20:40.000000000 +0400
+++ dir/Configure 2012-10-30 13:57:56.409598198 +0400
@@ -18,6 +18,8 @@
# --prefix option is given; /usr/local/ssl otherwise)
# --prefix prefix for the OpenSSL include, lib and bin directories
# (Default: the OPENSSLDIR directory)
+# --enginesdir engines shared library location
+# (Default: $prefix/lib/engines)
#
# --install_prefix Additional prefix for package builders (empty by
# default). This needn't be set in advance, you can
@@ -658,6 +660,7 @@
my $prefix="";
my $libdir="";
my $openssldir="";
+my $enginesdir="";
my $exe_ext="";
my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
my $cross_compile_prefix="";
@@ -886,6 +889,10 @@
{
$openssldir=$1;
}
+ elsif (/^--enginesdir=(.*)$/)
+ {
+ $enginesdir=$1;
+ }
elsif (/^--install.prefix=(.*)$/)
{
$install_prefix=$1;
@@ -1186,6 +1193,11 @@
# we're ready to tolerate, so don't...
$multilib="" if !-d "$prefix/lib$multilib";
+if ($enginesdir eq "")
+ {
+ $enginesdir = "$prefix/lib$multilib/engines";
+ }
+
$libdir="lib$multilib" if $libdir eq "";
$cflags = "$cflags$exp_cflags";
@@ -1802,7 +1814,7 @@
}
elsif (/^#define\s+ENGINESDIR/)
{
- my $foo = "$prefix/$libdir/engines";
+ my $foo = $enginesdir;
$foo =~ s/\\/\\\\/g;
print OUT "#define ENGINESDIR \"$foo\"\n";
}
Only in dir: Configure.orig
|
