From: Richard Levitte <levitte@openssl.org>
Date: Mon, 29 Jan 2018 21:49:50 +0000 (+0100)
Subject: Restore perl variables for ENGINESDIR and OPENSSLDIR
X-Git-Tag: OpenSSL_1_1_1-pre1~95
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=85b8bea72e2434de5708462f0bf642c5f6bd2f0e;p=oweals%2Fopenssl.git

Restore perl variables for ENGINESDIR and OPENSSLDIR

For proper escaping, we need the direct perl variable values, not a
make variable reference.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5196)
---

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index ab2f8735c0..a14ab23ef9 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -176,8 +176,8 @@ EX_LIBS={- join(' ', @{$config{ex_libs}}) -}
 LIB_CPPFLAGS={- join(" ",
                      $target{shared_cppflag} || "",
                      (map { quotify_l("-D".$_) }
-                      'OPENSSLDIR="$(OPENSSLDIR)"',
-                      'ENGINESDIR="$(ENGINESDIR)"')) -}
+                      "OPENSSLDIR=\"$openssldir\"",
+                      "ENGINESDIR=\"$enginesdir\"")) -}
 LIB_CFLAGS={- join(" ", $target{lib_cflags}, $target{shared_cflag}) -}
 LIB_LDFLAGS={- join(' ', $target{shared_ldflag}, $config{shared_ldflag}) -}
 DSO_CPPFLAGS={- $target{dso_cppflags} || "" -}