diff options
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 14 | ||||
| -rw-r--r-- | VMS/openssl_shutdown.com.in | 9 | ||||
| -rw-r--r-- | VMS/openssl_startup.com.in | 6 |
3 files changed, 11 insertions, 18 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 8211d01f43..8a5da854f8 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -436,18 +436,14 @@ vmsconfig.pm : configdata.pm WRITE CONFIG "our @ISA = qw(Exporter);" WRITE CONFIG "our @EXPORT = qw(%config %target %withargs %unified_info %disabled);" WRITE CONFIG "our %config = (" - WRITE CONFIG " target => '{- $config{target} -}'," - WRITE CONFIG " version => '$(MAJOR).$(MINOR)'," + WRITE CONFIG " target => '","{- $config{target} -}","'," + WRITE CONFIG " version => '","{- $config{version} -}","'," + WRITE CONFIG " shlib_major => '","{- $config{shlib_major} -}","'," + WRITE CONFIG " shlib_minor => '","{- $config{shlib_minor} -}","'," WRITE CONFIG " no_shared => '","{- $disabled{shared} -}","'," WRITE CONFIG " INSTALLTOP => '$(INSTALLTOP)'," WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)'," - WRITE CONFIG " pointersize => '","{- $target{pointersize} -}","'," - WRITE CONFIG " shared_libs => [" - {- $disabled{shared} - ? "\@ !" - : join("\n ", map { "WRITE CONFIG \" '$_'," } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) - -} - WRITE CONFIG " ]," + WRITE CONFIG " pointer_size => '","{- $target{pointer_size} -}","'," WRITE CONFIG ");" WRITE CONFIG "our %target = ();" WRITE CONFIG "our %disabled = ();" diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in index 5385362304..73ef3808d4 100644 --- a/VMS/openssl_shutdown.com.in +++ b/VMS/openssl_shutdown.com.in @@ -24,14 +24,11 @@ $ arch := F$EDIT(F$GETSYI("ARCH_NAME"),"UPCASE") $ IF arch .EQS. "" THEN GOTO unknown_arch $ ENDIF $ -$ ! Generated information -$ VERSION := {- $config{version} -} -$ INSTALLTOP := {- $config{INSTALLTOP} -} -$ POINTER_SIZE = {- $config{pointersize} -} -$ $ ! Abbrevs $ DEAS := DEASSIGN /NOLOG 'P1' -$ v = VERSION - "." - "." +$ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -} +$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -} +$ pz := {- $config{pointer_size} -} $ $ DEAS OSSL$ROOT'v' $ DEAS OSSL$INCLUDE'v' diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index e5043b5bb0..f9350b00df 100644 --- a/VMS/openssl_startup.com.in +++ b/VMS/openssl_startup.com.in @@ -51,10 +51,8 @@ $ IF arch .EQS. "" THEN GOTO unknown_arch $ ENDIF $ $ ! Generated information -$ VERSION := {- $config{version} -} $ INSTALLTOP := {- $config{INSTALLTOP} -} $ OPENSSLDIR := {- $config{OPENSSLDIR} -} -$ POINTER_SIZE := {- $config{pointersize} -} $ $ ! Make sure that INSTALLTOP and OPENSSLDIR become something one $ ! can build concealed logical names on @@ -82,7 +80,9 @@ $ $ ! Abbrevs $ DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1' $ DEF := DEFINE /NOLOG 'P1' -$ v = VERSION - "." - "." +$ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -} +$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -} +$ pz := {- $config{pointer_size} -} $ $ DEFT OSSL$INSTROOT'v' 'INSTALLTOP_' $ DEFT OSSL$INCLUDE'v' OSSL$INSTROOT:[INCLUDE.] |