|
 |
aabbc9a |
diff -up openssl-1.0.0-beta4/Configure.enginesdir openssl-1.0.0-beta4/Configure
|
|
|
aabbc9a |
--- openssl-1.0.0-beta4/Configure.enginesdir 2009-11-12 12:17:59.000000000 +0100
|
|
|
aabbc9a |
+++ openssl-1.0.0-beta4/Configure 2009-11-12 12:19:45.000000000 +0100
|
|
|
aabbc9a |
@@ -622,6 +622,7 @@ my $idx_multilib = $idx++;
|
|
|
2ccfa6b |
my $prefix="";
|
|
|
aabbc9a |
my $libdir="";
|
|
|
2ccfa6b |
my $openssldir="";
|
|
|
2ccfa6b |
+my $enginesdir="";
|
|
|
2ccfa6b |
my $exe_ext="";
|
|
|
aabbc9a |
my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
|
|
|
2ccfa6b |
my $cross_compile_prefix="";
|
|
|
aabbc9a |
@@ -833,6 +834,10 @@ PROCESS_ARGS:
|
|
|
2ccfa6b |
{
|
|
|
2ccfa6b |
$openssldir=$1;
|
|
|
2ccfa6b |
}
|
|
|
2ccfa6b |
+ elsif (/^--enginesdir=(.*)$/)
|
|
|
2ccfa6b |
+ {
|
|
|
2ccfa6b |
+ $enginesdir=$1;
|
|
|
2ccfa6b |
+ }
|
|
|
2ccfa6b |
elsif (/^--install.prefix=(.*)$/)
|
|
|
2ccfa6b |
{
|
|
|
2ccfa6b |
$install_prefix=$1;
|
|
|
aabbc9a |
@@ -1055,7 +1060,7 @@ chop $prefix if $prefix =~ /.\/$/;
|
|
|
2ccfa6b |
|
|
|
2ccfa6b |
$openssldir=$prefix . "/ssl" if $openssldir eq "";
|
|
|
2ccfa6b |
$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
|
|
|
2ccfa6b |
-
|
|
|
2ccfa6b |
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
|
|
|
2ccfa6b |
|
|
|
2ccfa6b |
print "IsMK1MF=$IsMK1MF\n";
|
|
|
2ccfa6b |
|
|
|
aabbc9a |
@@ -1676,7 +1681,7 @@ while (<IN>)
|
|
|
2ccfa6b |
# $foo is to become "$prefix/lib$multilib/engines";
|
|
|
2ccfa6b |
# as Makefile.org and engines/Makefile are adapted for
|
|
|
2ccfa6b |
# $multilib suffix.
|
|
|
2ccfa6b |
- my $foo = "$prefix/lib/engines";
|
|
|
2ccfa6b |
+ my $foo = "$enginesdir";
|
|
|
2ccfa6b |
$foo =~ s/\\/\\\\/g;
|
|
|
2ccfa6b |
print OUT "#define ENGINESDIR \"$foo\"\n";
|
|
|
2ccfa6b |
}
|
|
|
aabbc9a |
diff -up openssl-1.0.0-beta4/engines/Makefile.enginesdir openssl-1.0.0-beta4/engines/Makefile
|
|
|
aabbc9a |
--- openssl-1.0.0-beta4/engines/Makefile.enginesdir 2009-11-10 02:52:52.000000000 +0100
|
|
|
aabbc9a |
+++ openssl-1.0.0-beta4/engines/Makefile 2009-11-12 12:23:06.000000000 +0100
|
|
|
aabbc9a |
@@ -124,7 +124,7 @@ install:
|
|
|
2ccfa6b |
sfx=".so"; \
|
|
|
aabbc9a |
cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
2ccfa6b |
fi; \
|
|
|
aabbc9a |
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
aabbc9a |
+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
aabbc9a |
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
|
|
2ccfa6b |
done; \
|
|
|
2ccfa6b |
fi
|