|
 |
a5ef24 |
diff -up openssl-1.0.0-beta5/Configure.enginesdir openssl-1.0.0-beta5/Configure
|
|
|
a5ef24 |
--- openssl-1.0.0-beta5/Configure.enginesdir 2010-01-20 18:07:05.000000000 +0100
|
|
|
a5ef24 |
+++ openssl-1.0.0-beta5/Configure 2010-01-20 18:10:48.000000000 +0100
|
|
|
a5ef24 |
@@ -622,6 +622,7 @@ my $idx_multilib = $idx++;
|
|
|
a5ef24 |
my $prefix="";
|
|
|
a5ef24 |
my $libdir="";
|
|
|
a5ef24 |
my $openssldir="";
|
|
|
a5ef24 |
+my $enginesdir="";
|
|
|
a5ef24 |
my $exe_ext="";
|
|
|
a5ef24 |
my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
|
|
|
a5ef24 |
my $cross_compile_prefix="";
|
|
|
a5ef24 |
@@ -833,6 +834,10 @@ PROCESS_ARGS:
|
|
|
a5ef24 |
{
|
|
|
a5ef24 |
$openssldir=$1;
|
|
|
a5ef24 |
}
|
|
|
a5ef24 |
+ elsif (/^--enginesdir=(.*)$/)
|
|
|
a5ef24 |
+ {
|
|
|
a5ef24 |
+ $enginesdir=$1;
|
|
|
a5ef24 |
+ }
|
|
|
a5ef24 |
elsif (/^--install.prefix=(.*)$/)
|
|
|
a5ef24 |
{
|
|
|
a5ef24 |
$install_prefix=$1;
|
|
|
a5ef24 |
@@ -1053,7 +1058,7 @@ chop $prefix if $prefix =~ /.\/$/;
|
|
|
a5ef24 |
|
|
|
a5ef24 |
$openssldir=$prefix . "/ssl" if $openssldir eq "";
|
|
|
a5ef24 |
$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
|
|
|
a5ef24 |
-
|
|
|
a5ef24 |
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
|
|
|
a5ef24 |
|
|
|
a5ef24 |
print "IsMK1MF=$IsMK1MF\n";
|
|
|
a5ef24 |
|
|
|
a5ef24 |
@@ -1673,7 +1678,7 @@ while (<IN>)
|
|
|
a5ef24 |
}
|
|
|
a5ef24 |
elsif (/^#define\s+ENGINESDIR/)
|
|
|
a5ef24 |
{
|
|
|
a5ef24 |
- my $foo = "$prefix/$libdir/engines";
|
|
|
a5ef24 |
+ my $foo = "$enginesdir";
|
|
|
a5ef24 |
$foo =~ s/\\/\\\\/g;
|
|
|
a5ef24 |
print OUT "#define ENGINESDIR \"$foo\"\n";
|
|
|
a5ef24 |
}
|
|
|
a5ef24 |
diff -up openssl-1.0.0-beta5/engines/Makefile.enginesdir openssl-1.0.0-beta5/engines/Makefile
|
|
|
a5ef24 |
--- openssl-1.0.0-beta5/engines/Makefile.enginesdir 2010-01-16 21:06:09.000000000 +0100
|
|
|
a5ef24 |
+++ openssl-1.0.0-beta5/engines/Makefile 2010-01-20 18:07:05.000000000 +0100
|
|
|
a5ef24 |
@@ -124,7 +124,7 @@ install:
|
|
|
a5ef24 |
sfx=".so"; \
|
|
|
a5ef24 |
cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
a5ef24 |
fi; \
|
|
|
a5ef24 |
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
a5ef24 |
+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
a5ef24 |
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
|
|
a5ef24 |
done; \
|
|
|
a5ef24 |
fi
|