diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-29 22:49:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-01-29 22:49:50 +0100 |
| commit | 85b8bea72e2434de5708462f0bf642c5f6bd2f0e (patch) | |
| tree | 794ee802d32d5122bcdc552b1448be29a2386f4e /Configurations | |
| parent | 1edd899d1127465941c0297806c18749b3ea0c9b (diff) | |
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)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
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} || "" -} |