Restore perl variables for ENGINESDIR and OPENSSLDIR
authorRichard Levitte <levitte@openssl.org>
Mon, 29 Jan 2018 21:49:50 +0000 (22:49 +0100)
committerRichard Levitte <levitte@openssl.org>
Mon, 29 Jan 2018 21:49:50 +0000 (22:49 +0100)
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)

Configurations/windows-makefile.tmpl

index ab2f873..a14ab23 100644 (file)
@@ -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} || "" -}