diff -up openssl-1.0.0-beta4/Configure.enginesdir openssl-1.0.0-beta4/Configure --- openssl-1.0.0-beta4/Configure.enginesdir 2009-11-12 12:17:59.000000000 +0100 +++ openssl-1.0.0-beta4/Configure 2009-11-12 12:19:45.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; @@ -1055,7 +1060,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"; @@ -1676,7 +1681,7 @@ while () # $foo is to become "$prefix/lib$multilib/engines"; # as Makefile.org and engines/Makefile are adapted for # $multilib suffix. - my $foo = "$prefix/lib/engines"; + my $foo = "$enginesdir"; $foo =~ s/\\/\\\\/g; print OUT "#define ENGINESDIR \"$foo\"\n"; } diff -up openssl-1.0.0-beta4/engines/Makefile.enginesdir openssl-1.0.0-beta4/engines/Makefile --- openssl-1.0.0-beta4/engines/Makefile.enginesdir 2009-11-10 02:52:52.000000000 +0100 +++ openssl-1.0.0-beta4/engines/Makefile 2009-11-12 12:23:06.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