[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f8baec39245ec434da00b690058792611cf08d47 (commit)
      from  abeb2a639b7030aeac08aab4fd9d6b52a3be8b04 (commit)


- Log -----------------------------------------------------------------
commit f8baec39245ec434da00b690058792611cf08d47
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Jun 11 13:10:15 2017 +0200

    Fix the comment about default OPENSSLDIR in windows.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3650)

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 427c27d..c0af609 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -121,7 +121,7 @@ INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet
 INSTALLTOP_dir={- $prefix_dir -}
 OPENSSLDIR_dev={- #
                   # The logic here is that if no --openssldir was given,
-                  # OPENSSLDIR will get the value from $prefix plus "/ssl".
+                  # OPENSSLDIR will get the value "$win_commonroot\\SSL".
                   # If --openssldir was given and the value is an absolute
                   # path, OPENSSLDIR will get its value without change.
                   # If the value from --openssldir is a relative path,