| 1 |
diff -up openssl-1.0.0-beta3/Configure.enginesdir openssl-1.0.0-beta3/Configure
|
| 2 |
--- openssl-1.0.0-beta3/Configure.enginesdir 2009-08-10 19:46:32.000000000 +0200
|
| 3 |
+++ openssl-1.0.0-beta3/Configure 2009-08-10 19:46:32.000000000 +0200
|
| 4 |
@@ -616,6 +616,7 @@ my $idx_multilib = $idx++;
|
| 5 |
|
| 6 |
my $prefix="";
|
| 7 |
my $openssldir="";
|
| 8 |
+my $enginesdir="";
|
| 9 |
my $exe_ext="";
|
| 10 |
my $install_prefix="";
|
| 11 |
my $cross_compile_prefix="";
|
| 12 |
@@ -820,6 +821,10 @@ PROCESS_ARGS:
|
| 13 |
{
|
| 14 |
$openssldir=$1;
|
| 15 |
}
|
| 16 |
+ elsif (/^--enginesdir=(.*)$/)
|
| 17 |
+ {
|
| 18 |
+ $enginesdir=$1;
|
| 19 |
+ }
|
| 20 |
elsif (/^--install.prefix=(.*)$/)
|
| 21 |
{
|
| 22 |
$install_prefix=$1;
|
| 23 |
@@ -1037,7 +1042,7 @@ chop $prefix if $prefix =~ /.\/$/;
|
| 24 |
|
| 25 |
$openssldir=$prefix . "/ssl" if $openssldir eq "";
|
| 26 |
$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
|
| 27 |
-
|
| 28 |
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
|
| 29 |
|
| 30 |
print "IsMK1MF=$IsMK1MF\n";
|
| 31 |
|
| 32 |
@@ -1645,7 +1650,7 @@ while (<IN>)
|
| 33 |
# $foo is to become "$prefix/lib$multilib/engines";
|
| 34 |
# as Makefile.org and engines/Makefile are adapted for
|
| 35 |
# $multilib suffix.
|
| 36 |
- my $foo = "$prefix/lib/engines";
|
| 37 |
+ my $foo = "$enginesdir";
|
| 38 |
$foo =~ s/\\/\\\\/g;
|
| 39 |
print OUT "#define ENGINESDIR \"$foo\"\n";
|
| 40 |
}
|
| 41 |
diff -up openssl-1.0.0-beta3/engines/Makefile.enginesdir openssl-1.0.0-beta3/engines/Makefile
|
| 42 |
--- openssl-1.0.0-beta3/engines/Makefile.enginesdir 2009-06-14 04:37:22.000000000 +0200
|
| 43 |
+++ openssl-1.0.0-beta3/engines/Makefile 2009-08-10 19:46:48.000000000 +0200
|
| 44 |
@@ -123,7 +123,7 @@ install:
|
| 45 |
sfx=".so"; \
|
| 46 |
cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
|
| 47 |
fi; \
|
| 48 |
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
|
| 49 |
+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \
|
| 50 |
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx ); \
|
| 51 |
done; \
|
| 52 |
fi
|