From: Richard Levitte <levitte@openssl.org>
Date: Wed, 13 Mar 2019 12:24:17 +0000 (+0100)
Subject: Configurations/windows-makefile.tmpl: small fixes
X-Git-Tag: openssl-3.0.0-alpha1~2358
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=52eb5b7ca46a1bf0bb0e148c651eb7dcaae1a074;p=oweals%2Fopenssl.git

Configurations/windows-makefile.tmpl: small fixes

Fixes #8467 #8478

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8468)
---

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index f327169c80..8999d6f140 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -148,7 +148,7 @@ OPENSSLDIR_dev={- #
 OPENSSLDIR_dir={- canonpath($openssldir_dir) -}
 LIBDIR={- our $libdir = $config{libdir} || "lib";
           file_name_is_absolute($libdir) ? "" : $libdir -}
-MODULESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath);
+MODULESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath catpath);
                   our $modulesprefix = catdir($prefix,$libdir);
                   our ($modulesprefix_dev, $modulesprefix_dir,
                        $modulesprefix_file) =
@@ -158,7 +158,7 @@ MODULESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath);
                       catdir($modulesprefix_dir, "ossl-modules");
                   our $modulesdir = catpath($modulesdir_dev, $modulesdir_dir);
                   our $enginesdir_dev = $modulesprefix_dev;
-                  out $enginesdir_dir =
+                  our $enginesdir_dir =
                       catdir($modulesprefix_dir, "engines-$sover_dirname");
                   our $enginesdir = catpath($enginesdir_dev, $enginesdir_dir);
                   $modulesdir_dev -}