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 ab2f8735c0dac515644ce19d1b4f45e22ef5408a..a14ab23ef9cb0a82bb28bcbce73eeb6e5a66bf9a 100644 (file)
--- 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} || "" -}