From 0685b15a68db1cd24678432f38b88f217495cbb9 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 30 Jun 2016 00:10:21 +0200 Subject: [PATCH] Windows: Recreate the $prefix variable $prefix was removed as part of the DESTDIR work. However, it was still used to create the ENGINESDIR_dev and ENGINESDIR_dir variables, so a restoration is needed. Reviewed-by: Rich Salz --- Configurations/windows-makefile.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index b2e6cf5d5e..fa430b6d6d 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -90,9 +90,9 @@ GENERATED={- join(" ", INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet # use File::Spec::Functions qw(:DEFAULT splitpath); + our $prefix = $config{prefix} || "$win_installroot\\OpenSSL"; our ($prefix_dev, $prefix_dir, $prefix_file) = - splitpath($config{prefix} || "$win_installroot\\OpenSSL", - 1); + splitpath($prefix, 1); $prefix_dev -} INSTALLTOP_dir={- $prefix_dir -} OPENSSLDIR_dev={- # -- 2.25.1