[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  70411a50d4b207e6d0352c12588e93c0c206ca39 (commit)
      from  47f387e98ebc9867ee7902a43d7bb35462175ce6 (commit)


- Log -----------------------------------------------------------------
commit 70411a50d4b207e6d0352c12588e93c0c206ca39
Author: Richard Levitte <levi...@openssl.org>
Date:   Fri Apr 24 10:08:42 2020 +0200

    Configurations/windows-makefile.tmpl: Fix template code for INSTALL_MODULES
    
    Fixes #11623
    
    Reviewed-by: Matt Caswell <m...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11629)

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

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

diff --git a/Configurations/windows-makefile.tmpl 
b/Configurations/windows-makefile.tmpl
index c9f6ccfc4d..7246ed168c 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -95,12 +95,10 @@ INSTALL_ENGINEPDBS={-
                   @{$unified_info{modules}})
 -}
 INSTALL_MODULES={-
-        join(" \\\n" . ' ' x 16,
-             fill_lines(" ", $COLUMNS - 16,
-                        map { platform->dso($_) }
-                        grep { 
!$unified_info{attributes}->{modules}->{$_}->{noinst}
-                               && 
!$unified_info{attributes}->{modules}->{$_}->{engine} }
-                        @{$unified_info{modules}}))
+        join(" ", map { platform->dso($_) }
+                  grep { !$unified_info{attributes}->{modules}->{$_}->{noinst}
+                          && 
!$unified_info{attributes}->{modules}->{$_}->{engine} }
+                  @{$unified_info{modules}})
 -}
 INSTALL_MODULEPDBS={-
         join(" ", map { quotify1(platform->dsopdb($_)) }