From ee0a61cfb827097d510f3ef09d00d0382d9ff46d Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 6 Jul 2016 18:37:52 +0200 Subject: [PATCH] Versioning engines default location: the Windows case OpenSSL engines are tied to the OpenSSL shared library versions, starting with OpenSSL 1.1. We therefore need to install them in directories which have the shared library version in it's name, to easily allow multiple OpenSSL versions to be installed at the same time. For windows, the default installation directory is changed from $PREFIX/lib/engines to $PREFIX/lib/engines-${major}_${minor} ($PREFIX is the directory given for the configuration option --prefix, and ${major} and ${minor} are the major and minor shared library version numbers) Reviewed-by: Rich Salz --- Configurations/windows-makefile.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 70fec0a8c7..9b7bcabc6e 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -11,6 +11,8 @@ our $shlibextimport = $target{shared_import_extension} || ".lib"; our $dsoext = $target{dso_extension} || ".dll"; + our $sover = $config{shlib_major}."_".$config{shlib_minor}; + my $win_installenv = $target{build_scheme}->[2] eq "VC-W32" ? "ProgramFiles(x86)" : "ProgramW6432"; @@ -118,7 +120,7 @@ OPENSSLDIR_dir={- $openssldir_dir -} LIBDIR={- our $libdir = $config{libdir} || "lib"; $libdir -} ENGINESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath); - my $enginesdir = catdir($prefix,$libdir,"engines"); + my $enginesdir = catdir($prefix,$libdir,"engines-$sover"); our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) = splitpath($enginesdir, 1); $enginesdir_dev -} -- 2.34.1