[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5de20b26e5a1ac3f42c5c3e8ce0a3e6c427d10c7 (commit)
      from  846e4c4d650da50f049ee74901e840ffe409fa69 (commit)


- Log -----------------------------------------------------------------
commit 5de20b26e5a1ac3f42c5c3e8ce0a3e6c427d10c7
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Mar 9 22:58:32 2018 +0100

    Configurations/descrip.mms.tmpl: Fix small errors
    
    A missing parenthesis here, a missing comma there...
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5579)

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

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

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 1972314..bbf00a1 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -176,7 +176,7 @@ ENGINESDIR_C={- $osslprefix -}ENGINES{- $sover_dirname.$target{pointer_size} -}:
 CC={- $config{CC} -}
 CPP={- $config{CPP} -}
 DEFINES={- our $defines1 = join('', map { ",$_" } @{$config{CPPDEFINES}}) -}
-INCLUDES={- our $includes1 = join('', map { ",$_" } @{$config{CPPINCLUDES}}) -}
+INCLUDES={- our $includes1 = join(',', @{$config{CPPINCLUDES}}) -}
 CPPFLAGS={- our $cppflags1 = join('', @{$config{CPPFLAGS}}) -}
 CFLAGS={- join('', @{$config{CFLAGS}}) -}
 LDFLAGS={- join('', @{$config{LFLAGS}}) -}
@@ -225,7 +225,7 @@ LIB_DEFINES={- our $lib_defines =
                join('', (map { ",$_" } @{$target{lib_defines}},
                                        @{$target{shared_defines}},
                                        @{$config{lib_defines}},
-                                       @{$config{shared_defines}});
+                                       @{$config{shared_defines}}));
                join('', $lib_defines,
                         (map { ",$_" } 'OPENSSLDIR="""$(OPENSSLDIR_C)"""',
                                        'ENGINESDIR="""$(ENGINESDIR_C)"""'),
@@ -241,7 +241,7 @@ LIB_CPPFLAGS={- our $lib_cppflags =
                          @{$config{lib_cppflags}},
                          @{$config{shared_cppflag}});
                 join('', "'qual_includes'",
-                         '/DEFINE=(__dummy$(LIB_DEFINES))'
+                         '/DEFINE=(__dummy$(LIB_DEFINES))',
                          $lib_cppflags,
                          '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
 LIB_CFLAGS={- join('', $target{lib_cflags} || (),