Commit 85b8bea7 authored by Richard Levitte's avatar Richard Levitte
Browse files

Restore perl variables for ENGINESDIR and OPENSSLDIR 



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

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5196)
parent 1edd899d

Configurations/windows-makefile.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -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} || "" -}