109 lines
4.9 KiB
Diff
109 lines
4.9 KiB
Diff
|
From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
|
||
|
|
Date: Thu, 13 Dec 2018 23:27:46 +0100
|
||
|
|
Subject: engines-path
|
||
|
|
|
||
|
|
===================================================================
|
||
|
|
---
|
||
|
|
Configure | 2 +-
|
||
|
|
Makefile.org | 4 ++--
|
||
|
|
engines/Makefile | 10 +++++-----
|
||
|
|
engines/ccgost/Makefile | 8 ++++----
|
||
|
|
4 files changed, 12 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Configure b/Configure
|
||
|
|
index 2840266ae9c3..f41a479e6c13 100755
|
||
|
|
--- a/Configure
|
||
|
|
+++ b/Configure
|
||
|
|
@@ -1994,7 +1994,7 @@ while (<IN>)
|
||
|
|
}
|
||
|
|
elsif (/^#define\s+ENGINESDIR/)
|
||
|
|
{
|
||
|
|
- my $foo = "$prefix/$libdir/engines";
|
||
|
|
+ my $foo = "$prefix/$libdir/openssl-1.0.2/engines";
|
||
|
|
$foo =~ s/\\/\\\\/g;
|
||
|
|
print OUT "#define ENGINESDIR \"$foo\"\n";
|
||
|
|
}
|
||
|
|
diff --git a/Makefile.org b/Makefile.org
|
||
|
|
index 8089d3fc2ead..d24ff26c8cab 100644
|
||
|
|
--- a/Makefile.org
|
||
|
|
+++ b/Makefile.org
|
||
|
|
@@ -369,7 +369,7 @@ libcrypto.pc: Makefile
|
||
|
|
echo 'exec_prefix=$${prefix}'; \
|
||
|
|
echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
|
||
|
|
echo 'includedir=$${prefix}/include'; \
|
||
|
|
- echo 'enginesdir=$${libdir}/engines'; \
|
||
|
|
+ echo 'enginesdir=$${libdir}/openssl-1.0.2/engines'; \
|
||
|
|
echo ''; \
|
||
|
|
echo 'Name: OpenSSL-libcrypto'; \
|
||
|
|
echo 'Description: OpenSSL cryptography library'; \
|
||
|
|
@@ -545,7 +545,7 @@ install: all install_docs install_sw
|
||
|
|
install_sw:
|
||
|
|
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
|
||
|
|
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
|
||
|
|
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
|
||
|
|
+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines \
|
||
|
|
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
|
||
|
|
$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
|
||
|
|
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
|
||
|
|
diff --git a/engines/Makefile b/engines/Makefile
|
||
|
|
index 2058ff405afe..df7def6174fd 100644
|
||
|
|
--- a/engines/Makefile
|
||
|
|
+++ b/engines/Makefile
|
||
|
|
@@ -107,13 +107,13 @@ lib: $(LIBOBJ)
|
||
|
|
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
|
||
|
|
@if [ -n "$(SHARED_LIBS)" ]; then \
|
||
|
|
set -e; \
|
||
|
|
- $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
|
||
|
|
+ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines; \
|
||
|
|
for l in $(LIBNAMES); do \
|
||
|
|
( echo installing $$l; \
|
||
|
|
pfx=lib; \
|
||
|
|
if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
|
||
|
|
sfx=".so"; \
|
||
|
|
- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
||
|
|
+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \
|
||
|
|
else \
|
||
|
|
case "$(CFLAGS)" in \
|
||
|
|
*DSO_BEOS*) sfx=".so";; \
|
||
|
|
@@ -122,10 +122,10 @@ lib: $(LIBOBJ)
|
||
|
|
*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
|
||
|
|
*) sfx=".bad";; \
|
||
|
|
esac; \
|
||
|
|
- cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
||
|
|
+ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \
|
||
|
|
fi; \
|
||
|
|
- chmod 555 $(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 ); \
|
||
|
|
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \
|
||
|
|
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx ); \
|
||
|
|
done; \
|
||
|
|
fi
|
||
|
|
@target=install; $(RECURSIVE_MAKE)
|
||
|
|
diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
|
||
|
|
index f378530c8642..b42a64162730 100644
|
||
|
|
--- a/engines/ccgost/Makefile
|
||
|
|
+++ b/engines/ccgost/Makefile
|
||
|
|
@@ -47,7 +47,7 @@ lib: $(LIBOBJ)
|
||
|
|
pfx=lib; \
|
||
|
|
if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
|
||
|
|
sfx=".so"; \
|
||
|
|
- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||
|
|
+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||
|
|
else \
|
||
|
|
case "$(CFLAGS)" in \
|
||
|
|
*DSO_BEOS*) sfx=".so";; \
|
||
|
|
@@ -56,10 +56,10 @@ lib: $(LIBOBJ)
|
||
|
|
*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
|
||
|
|
*) sfx=".bad";; \
|
||
|
|
esac; \
|
||
|
|
- cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||
|
|
+ cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||
|
|
fi; \
|
||
|
|
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||
|
|
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
|
||
|
|
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
||
|
|
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx; \
|
||
|
|
fi
|
||
|
|
|
||
|
|
links:
|