From ee7fb55e88545e683b91e6fd0d661c13b4719529 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 9 May 2016 22:59:02 +0200 Subject: Fix VMS/openssl_{startup,shutddown}.com.in They were using the wrong variables. Reviewed-by: Andy Polyakov --- VMS/openssl_shutdown.com.in | 8 ++------ VMS/openssl_startup.com.in | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'VMS') diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in index 236979eab2..5385362304 100644 --- a/VMS/openssl_shutdown.com.in +++ b/VMS/openssl_shutdown.com.in @@ -39,9 +39,7 @@ $ DEAS OSSL$LIB'v' $ DEAS OSSL$SHARE'v' $ DEAS OSSL$ENGINES'v' $ DEAS OSSL$EXE'v' -$ {- output_off() if $disabled{shared} -} -$ {- join("\n\$ ", map { "DEAS $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -$ {- output_on() -} +$ {- join("\n\$ ", map { my $x = uc $_; "DEAS ${x}'v'" } @{$config{shared_libs}}) -} $ IF P2 .NES. "NOALIASES" $ THEN $ DEAS OSSL$ROOT @@ -51,9 +49,7 @@ $ DEAS OSSL$SHARE $ DEAS OSSL$ENGINES $ DEAS OSSL$EXE $ DEAS OPENSSL -$ {- output_off() if $disabled{shared} -} -$ {- join("\n\$ ", map { "DEAS $_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -$ {- output_on() -} +$ {- join("\n\$ ", map { my $x = uc $_; "DEAS ${x}" } @{$config{shared_libs}}) -} $ ENDIF $ $ EXIT 'status' diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index caad02278b..e5043b5bb0 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -90,9 +90,7 @@ $ DEF OSSL$LIB'v' OSSL$INSTROOT:[LIB.'arch'] $ DEF OSSL$SHARE'v' OSSL$INSTROOT:[LIB.'arch'] $ DEF OSSL$ENGINES'v' OSSL$INSTROOT:[ENGINES.'arch'] $ DEF OSSL$EXE'v' OSSL$INSTROOT:[EXE.'arch'] -$ {- output_off() if $disabled{shared} -} -$ {- join("\n\$ ", map { "DEF $_'v' OSSL\$SHARE:$_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -$ {- output_on() -} +$ {- join("\n\$ ", map { my $x = uc $_; "DEF ${x}'v' OSSL\$SHARE:${x}" } @{$config{shared_libs}}) -} $ IF P2 .NES. "NOALIASES" $ THEN $ DEF OSSL$INSTROOT OSSL$INSTROOT'v' @@ -102,9 +100,7 @@ $ DEF OSSL$SHARE OSSL$SHARE'v' $ DEF OSSL$ENGINES OSSL$ENGINES'v' $ DEF OSSL$EXE OSSL$EXE'v' $ DEF OPENSSL OSSL$INCLUDE:[OPENSSL] -$ {- output_off() if $disabled{shared} -} -$ {- join("\n\$ ", map { "DEF $_ $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -} -$ {- output_on() -} +$ {- join("\n\$ ", map { my $x = uc $_; "DEF ${x} ${x}'v'" } @{$config{shared_libs}}) -} $ ENDIF $ $ DEFT OSSL$DATAROOT 'OPENSSLDIR_' -- cgit v1.2.3