|
 |
96a864 |
diff --git a/Configure b/Configure
|
|
|
96a864 |
index c39f71a..7f3d905 100755
|
|
|
96a864 |
--- a/Configure
|
|
|
96a864 |
+++ b/Configure
|
|
|
96a864 |
@@ -727,6 +727,7 @@ my $idx_multilib = $idx++;
|
|
|
96a864 |
my $prefix="";
|
|
|
96a864 |
my $libdir="";
|
|
|
96a864 |
my $openssldir="";
|
|
|
96a864 |
+my $enginesdir="";
|
|
|
96a864 |
my $exe_ext="";
|
|
|
96a864 |
my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
|
|
|
96a864 |
my $cross_compile_prefix="";
|
|
|
96a864 |
@@ -956,6 +957,10 @@ PROCESS_ARGS:
|
|
|
96a864 |
{
|
|
|
96a864 |
$openssldir=$1;
|
|
|
96a864 |
}
|
|
|
96a864 |
+ elsif (/^--enginesdir=(.*)$/)
|
|
|
96a864 |
+ {
|
|
|
96a864 |
+ $enginesdir=$1;
|
|
|
96a864 |
+ }
|
|
|
96a864 |
elsif (/^--install.prefix=(.*)$/)
|
|
|
96a864 |
{
|
|
|
96a864 |
$install_prefix=$1;
|
|
|
96a864 |
@@ -1207,7 +1212,7 @@ chop $prefix if $prefix =~ /.\/$/;
|
|
|
96a864 |
|
|
|
96a864 |
$openssldir=$prefix . "/ssl" if $openssldir eq "";
|
|
|
96a864 |
$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
|
|
|
96a864 |
-
|
|
|
96a864 |
+$enginesdir="$prefix/lib/engines" if $enginesdir eq "";
|
|
|
96a864 |
|
|
|
96a864 |
print "IsMK1MF=$IsMK1MF\n";
|
|
|
96a864 |
|
|
|
96a864 |
@@ -1709,6 +1714,7 @@ while (<IN>)
|
|
|
96a864 |
s/^INSTALLTOP=.*$/INSTALLTOP=$prefix/;
|
|
|
96a864 |
s/^MULTILIB=.*$/MULTILIB=$multilib/;
|
|
|
96a864 |
s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/;
|
|
|
96a864 |
+ s/^ENGINESDIR=.*$/ENGINESDIR=$enginesdir/;
|
|
|
96a864 |
s/^LIBDIR=.*$/LIBDIR=$libdir/;
|
|
|
96a864 |
s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/;
|
|
|
96a864 |
s/^PLATFORM=.*$/PLATFORM=$target/;
|
|
|
96a864 |
@@ -1915,7 +1921,7 @@ while (<IN>)
|
|
|
96a864 |
}
|
|
|
96a864 |
elsif (/^#define\s+ENGINESDIR/)
|
|
|
96a864 |
{
|
|
|
96a864 |
- my $foo = "$prefix/$libdir/engines";
|
|
|
96a864 |
+ my $foo = "$enginesdir";
|
|
|
96a864 |
$foo =~ s/\\/\\\\/g;
|
|
|
96a864 |
print OUT "#define ENGINESDIR \"$foo\"\n";
|
|
|
96a864 |
}
|
|
|
96a864 |
diff --git a/Makefile.org b/Makefile.org
|
|
|
96a864 |
index 2377f50..fe8d54c 100644
|
|
|
96a864 |
--- a/Makefile.org
|
|
|
96a864 |
+++ b/Makefile.org
|
|
|
96a864 |
@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
|
|
|
96a864 |
|
|
|
96a864 |
# Do not edit this manually. Use Configure --openssldir=DIR do change this!
|
|
|
96a864 |
OPENSSLDIR=/usr/local/ssl
|
|
|
96a864 |
+ENGINESDIR=$${libdir}/engines
|
|
|
96a864 |
|
|
|
96a864 |
# NO_IDEA - Define to build without the IDEA algorithm
|
|
|
96a864 |
# NO_RC4 - Define to build without the RC4 algorithm
|
|
|
96a864 |
@@ -368,7 +369,7 @@ libcrypto.pc: Makefile
|
|
|
96a864 |
echo 'exec_prefix=$${prefix}'; \
|
|
|
96a864 |
echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
|
|
|
96a864 |
echo 'includedir=$${prefix}/include'; \
|
|
|
96a864 |
- echo 'enginesdir=$${libdir}/engines'; \
|
|
|
96a864 |
+ echo 'enginesdir=$(ENGINESDIR)'; \
|
|
|
96a864 |
echo ''; \
|
|
|
96a864 |
echo 'Name: OpenSSL-libcrypto'; \
|
|
|
96a864 |
echo 'Description: OpenSSL cryptography library'; \
|
|
|
96a864 |
diff --git a/engines/Makefile b/engines/Makefile
|
|
|
96a864 |
index 2058ff4..a2c407b 100644
|
|
|
96a864 |
--- a/engines/Makefile
|
|
|
96a864 |
+++ b/engines/Makefile
|
|
|
96a864 |
@@ -124,7 +124,7 @@ install:
|
|
|
96a864 |
esac; \
|
|
|
96a864 |
cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
96a864 |
fi; \
|
|
|
96a864 |
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
96a864 |
+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
|
96a864 |
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
|
|
96a864 |
done; \
|
|
|
96a864 |
fi
|