]>
Commit | Line | Data |
---|---|---|
0f90adc0 EK |
1 | diff -up openssl-1.0.0-beta5/Configure.enginesdir openssl-1.0.0-beta5/Configure |
2 | --- openssl-1.0.0-beta5/Configure.enginesdir 2010-01-20 18:07:05.000000000 +0100 | |
3 | +++ openssl-1.0.0-beta5/Configure 2010-01-20 18:10:48.000000000 +0100 | |
4 | @@ -622,6 +622,7 @@ my $idx_multilib = $idx++; | |
5 | my $prefix=""; | |
6 | my $libdir=""; | |
7 | my $openssldir=""; | |
8 | +my $enginesdir=""; | |
9 | my $exe_ext=""; | |
10 | my $install_prefix= "$ENV{'INSTALL_PREFIX'}"; | |
11 | my $cross_compile_prefix=""; | |
12 | @@ -833,6 +834,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 | @@ -1053,7 +1058,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 | @@ -1673,7 +1678,7 @@ while (<IN>) | |
33 | } | |
34 | elsif (/^#define\s+ENGINESDIR/) | |
35 | { | |
36 | - my $foo = "$prefix/$libdir/engines"; | |
37 | + my $foo = "$enginesdir"; | |
38 | $foo =~ s/\\/\\\\/g; | |
39 | print OUT "#define ENGINESDIR \"$foo\"\n"; | |
40 | } | |
41 | diff -up openssl-1.0.0-beta5/engines/Makefile.enginesdir openssl-1.0.0-beta5/engines/Makefile | |
42 | --- openssl-1.0.0-beta5/engines/Makefile.enginesdir 2010-01-16 21:06:09.000000000 +0100 | |
43 | +++ openssl-1.0.0-beta5/engines/Makefile 2010-01-20 18:07:05.000000000 +0100 | |
44 | @@ -124,7 +124,7 @@ install: | |
45 | sfx=".so"; \ | |
46 | cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ | |
47 | fi; \ | |
48 | - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ | |
49 | + chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ | |
50 | mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ | |
51 | done; \ | |
52 | fi |