diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-02 08:31:00 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-02 15:49:45 +0200 |
| commit | 34d5490a1dc0d3c27743879f303102528e567f82 (patch) | |
| tree | 0420138cca0219c697eb500ecdcbc6c168b437e7 /VMS | |
| parent | Add the missing pointer_size information on VMS configs (diff) | |
| download | openssl-34d5490a1dc0d3c27743879f303102528e567f82.tar.xz openssl-34d5490a1dc0d3c27743879f303102528e567f82.zip | |
Pass down correct information to the VMS startup script templates
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'VMS')
| -rw-r--r-- | VMS/openssl_shutdown.com.in | 9 | ||||
| -rw-r--r-- | VMS/openssl_startup.com.in | 6 |
2 files changed, 6 insertions, 9 deletions
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.] |