From 85b8bea72e2434de5708462f0bf642c5f6bd2f0e Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 29 Jan 2018 22:49:50 +0100 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/5196) --- Configurations/windows-makefile.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Configurations') 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} || "" -} -- cgit v1.2.3