From: Richard Levitte <levitte@openssl.org>
Date: Wed, 29 Jun 2016 22:10:21 +0000 (+0200)
Subject: Windows: Recreate the $prefix variable
X-Git-Tag: OpenSSL_1_1_0-pre6~302
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0685b15a68db1cd24678432f38b88f217495cbb9;p=oweals%2Fopenssl.git

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 <rsalz@openssl.org>
---

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={- #