[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f6f159e7a133d1b2f82a82fab3f8c357a07b574f (commit)
      from  63794b048cbe46ac9abb883df4dd703f522e4643 (commit)


- Log -----------------------------------------------------------------
commit f6f159e7a133d1b2f82a82fab3f8c357a07b574f
Author: Richard Levitte <levi...@openssl.org>
Date:   Mon Jul 6 11:35:25 2020 +0200

    Makefile template: fix incorrect treatment of produced document files
    
    Documentation files were treated as programs when assigning to the
    make variables HTMLDOCS{1,3,5,7} and MANDOCS{1,3,5,7}, which is is
    incorrect on POSIX sub-systems where executables have an extension
    (.exe).
    
    Fixes #11937
    
    Reviewed-by: Matt Caswell <m...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12374)

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl 
b/Configurations/unix-Makefile.tmpl
index 2586f73791..a0c5081b04 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -173,35 +173,35 @@ MISC_SCRIPTS={-
 -}
 HTMLDOCS1={-
         join(" \\\n" . ' ' x 10,
-             fill_lines(" ", $COLUMNS - 10, map { platform->bin($_) }
+             fill_lines(" ", $COLUMNS - 10,
                         @{$unified_info{htmldocs}->{man1}})) -}
 HTMLDOCS3={-
         join(" \\\n" . ' ' x 10,
-             fill_lines(" ", $COLUMNS - 10, map { platform->bin($_) }
+             fill_lines(" ", $COLUMNS - 10,
                         @{$unified_info{htmldocs}->{man3}})) -}
 HTMLDOCS5={-
         join(" \\\n" . ' ' x 10,
-             fill_lines(" ", $COLUMNS - 10, map { platform->bin($_) }
+             fill_lines(" ", $COLUMNS - 10,
                         @{$unified_info{htmldocs}->{man5}})) -}
 HTMLDOCS7={-
         join(" \\\n" . ' ' x 10,
-             fill_lines(" ", $COLUMNS - 10, map { platform->bin($_) }
+             fill_lines(" ", $COLUMNS - 10,
                         @{$unified_info{htmldocs}->{man7}})) -}
 MANDOCS1={-
         join(" \\\n" . ' ' x 9,
-             fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) }
+             fill_lines(" ", $COLUMNS - 9,
                         @{$unified_info{mandocs}->{man1}})) -}
 MANDOCS3={-
         join(" \\\n" . ' ' x 9,
-             fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) }
+             fill_lines(" ", $COLUMNS - 9,
                         @{$unified_info{mandocs}->{man3}})) -}
 MANDOCS5={-
         join(" \\\n" . ' ' x 9,
-             fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) }
+             fill_lines(" ", $COLUMNS - 9,
                         @{$unified_info{mandocs}->{man5}})) -}
 MANDOCS7={-
         join(" \\\n" . ' ' x 9,
-             fill_lines(" ", $COLUMNS - 9, map { platform->bin($_) }
+             fill_lines(" ", $COLUMNS - 9,
                         @{$unified_info{mandocs}->{man7}})) -}
 
 APPS_OPENSSL="{- use File::Spec::Functions;