[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  85b8bea72e2434de5708462f0bf642c5f6bd2f0e (commit)
       via  1edd899d1127465941c0297806c18749b3ea0c9b (commit)
      from  7187f0e1ea22e63454ec46f128d669acf1128a8f (commit)


- Log -----------------------------------------------------------------
commit 85b8bea72e2434de5708462f0bf642c5f6bd2f0e
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 29 22:49:50 2018 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5196)

commit 1edd899d1127465941c0297806c18749b3ea0c9b
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 29 21:54:52 2018 +0100

    Fix typo in Windows makefile template: quotify, not quotiry
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5196)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/windows-makefile.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 8548073..a14ab23 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -175,9 +175,9 @@ LDOUTFLAG={- $target{loutflag} || "/out:" -}$(OSSL_EMPTY)
 EX_LIBS={- join(' ', @{$config{ex_libs}}) -}
 LIB_CPPFLAGS={- join(" ",
                      $target{shared_cppflag} || "",
-                     (map { quotiry_l("-D".$_) }
-                      'OPENSSLDIR="$(OPENSSLDIR)"',
-                      'ENGINESDIR="$(ENGINESDIR)"')) -}
+                     (map { quotify_l("-D".$_) }
+                      "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} || "" -}