[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  661a396373fbd2082eee4ad6829336219ec7dac6 (commit)
      from  e5f969a82fa81fad8d1721fc0bc915ad3eea927c (commit)


- Log -----------------------------------------------------------------
commit 661a396373fbd2082eee4ad6829336219ec7dac6
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Aug 26 22:34:39 2016 +0200

    VMS: honor --openssldir setting
    
    Because of a perl operator priority mixup, the --openssldir argument
    wasn't honored.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

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

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 64b70ad..ce96778 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -151,7 +151,7 @@ INSTALLTOP={- our $installtop =
               $installtop -}
 SYSTARTUP={- catdir($installtop, '[.SYS$STARTUP]'); -}
 # This is the standard central area to store certificates, private keys...
-OPENSSLDIR={- catdir($config{openssldir}) ||
+OPENSSLDIR={- catdir($config{openssldir}) or
               $config{prefix} ? catdir($config{prefix},"COMMON")
                               : "SYS\$COMMON:[OPENSSL-COMMON]" -}
 # The same, but for C