You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.9 KiB
52 lines
1.9 KiB
diff -up openssl-1.0.0-beta5/Configure.enginesdir openssl-1.0.0-beta5/Configure |
|
--- openssl-1.0.0-beta5/Configure.enginesdir 2010-01-20 18:07:05.000000000 +0100 |
|
+++ openssl-1.0.0-beta5/Configure 2010-01-20 18:10:48.000000000 +0100 |
|
@@ -622,6 +622,7 @@ my $idx_multilib = $idx++; |
|
my $prefix=""; |
|
my $libdir=""; |
|
my $openssldir=""; |
|
+my $enginesdir=""; |
|
my $exe_ext=""; |
|
my $install_prefix= "$ENV{'INSTALL_PREFIX'}"; |
|
my $cross_compile_prefix=""; |
|
@@ -833,6 +834,10 @@ PROCESS_ARGS: |
|
{ |
|
$openssldir=$1; |
|
} |
|
+ elsif (/^--enginesdir=(.*)$/) |
|
+ { |
|
+ $enginesdir=$1; |
|
+ } |
|
elsif (/^--install.prefix=(.*)$/) |
|
{ |
|
$install_prefix=$1; |
|
@@ -1053,7 +1058,7 @@ chop $prefix if $prefix =~ /.\/$/; |
|
|
|
$openssldir=$prefix . "/ssl" if $openssldir eq ""; |
|
$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/; |
|
- |
|
+$enginesdir="$prefix/lib/engines" if $enginesdir eq ""; |
|
|
|
print "IsMK1MF=$IsMK1MF\n"; |
|
|
|
@@ -1673,7 +1678,7 @@ while (<IN>) |
|
} |
|
elsif (/^#define\s+ENGINESDIR/) |
|
{ |
|
- my $foo = "$prefix/$libdir/engines"; |
|
+ my $foo = "$enginesdir"; |
|
$foo =~ s/\\/\\\\/g; |
|
print OUT "#define ENGINESDIR \"$foo\"\n"; |
|
} |
|
diff -up openssl-1.0.0-beta5/engines/Makefile.enginesdir openssl-1.0.0-beta5/engines/Makefile |
|
--- openssl-1.0.0-beta5/engines/Makefile.enginesdir 2010-01-16 21:06:09.000000000 +0100 |
|
+++ openssl-1.0.0-beta5/engines/Makefile 2010-01-20 18:07:05.000000000 +0100 |
|
@@ -124,7 +124,7 @@ install: |
|
sfx=".so"; \ |
|
cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ |
|
fi; \ |
|
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ |
|
+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ |
|
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ |
|
done; \ |
|
fi
|
|
|