Fix some VMS inconsistencies

[openssl.git] / VMS / openssl_startup.com.in

diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index a968b44d6c0f27ed2a29ebb174f5ad4e71ace97f..b5570eecac0eb217c067af1748bab4bbd8ba1ed6 100644 (file)
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -46,31 +46,31 @@ $   IF F$GETSYI("CPU") .LT. 128
 $      THEN
 $          arch := VAX
 $      ELSE
-$          arch := F$EDIT(F$GETSYI("ARCH_NAME"),"UPCASE")
+$          arch = F$EDIT(F$GETSYI("ARCH_NAME"),"UPCASE")
 $          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
-$      INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") - "A.;" -
-                    - ".][000000" - "[000000." - "][" - "]" + ".]"
-$      OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") - "A.;" -
-                    - ".][000000" - "[000000." - "][" - "]" + ".]"
-$      DEFINE /TRANSLATION=CONCEALED /NOLOG WRK_INSTALLTOP 'INSTALLTOP_'
+$      INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") -
+                    - ".][000000" - "[000000." - "][" - "]A.;" + "."
+$      OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") -
+                    - ".][000000" - "[000000." - "][" - "]A.;" + "."
+$      DEFINE /TRANSLATION=CONCEALED /NOLOG WRK_INSTALLTOP 'INSTALLTOP_']
+$      DEFINE /TRANSLATION=CONCEALED /NOLOG WRK_OPENSSLDIR 'OPENSSLDIR_']
 $
 $      ! Check that things are in place, and specifically, the stuff
 $      ! belonging to this architecture
 $      IF F$SEARCH("WRK_INSTALLTOP:[000000]INCLUDE.DIR;1") .EQS. "" -
-          .OR. F$SEARCH("WRK_INSTALLTOP:[000000]''arch'.DIR;1") .EQS. "" -
-          .OR. F$SEARCH("WRK_INSTALLTOP:[''arch']LIB.DIR;1") .EQS. "" -
-          .OR. F$SEARCH("WRK_INSTALLTOP:[''arch']EXE.DIR;1") .EQS. "" -
-          .OR. F$SEARCH("WRK_INSTALLTOP:[000000]openssl.cnf;1") .EQS. ""
+          .OR. F$SEARCH("WRK_INSTALLTOP:[000000]LIB.DIR;1") .EQS. "" -
+          .OR. F$SEARCH("WRK_INSTALLTOP:[000000]EXE.DIR;1") .EQS. "" -
+          .OR. F$SEARCH("WRK_INSTALLTOP:[LIB]''arch'.DIR;1") .EQS. "" -
+          .OR. F$SEARCH("WRK_INSTALLTOP:[EXE]''arch'.DIR;1") .EQS. "" -
+          .OR. F$SEARCH("WRK_OPENSSLDIR:[000000]openssl.cnf") .EQS. ""
 $      THEN
 $          WRITE SYS$ERROR "''INSTALLTOP' doesn't look like an OpenSSL installation for ''arch'"
 $          status = %x00018292 ! RMS$_FNF, file not found
@@ -80,32 +80,36 @@ $
 $      ! 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.]
-$      DEF  OSSL$LIB'v'        OSSL$INSTROOT:['arch'.LIB]
-$      DEF  OSSL$SHARE'v'      OSSL$INSTROOT:['arch'.LIB]
-$      DEF  OSSL$ENGINES'v'    OSSL$INSTROOT:['arch'.ENGINES]
-$      DEF  OSSL$EXE'v'        OSSL$INSTROOT:['arch'.EXE]
-$       {- output_off() if $config{no_shared} -}
-$       {- join("\n\$       ", map { "DEF  $_'v' OSSL\$SHARE:$_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
-$       {- output_on() -}
+$      DEFT OSSL$INSTROOT'v'           'INSTALLTOP_']
+$      DEFT OSSL$INCLUDE'v'            'INSTALLTOP_'INCLUDE.]
+$      DEF  OSSL$LIB'v'                OSSL$INSTROOT'v':[LIB.'arch']
+$      DEF  OSSL$SHARE'v'              OSSL$INSTROOT'v':[LIB.'arch']
+$      DEF  OSSL$ENGINES'v'            OSSL$INSTROOT'v':[ENGINES.'arch']
+$      DEF  OSSL$EXE'v'                OSSL$INSTROOT'v':[EXE.'arch']
+$      DEF  OSSL$LIBCRYPTO'pz''v'      OSSL$LIB'v':OSSL$LIBCRYPTO'pz'.OLB
+$      DEF  OSSL$LIBSSL'pz''v'         OSSL$LIB'v':OSSL$LIBSSL'pz'.OLB
+$      DEF  OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE'v':OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE
+$      DEF  OSSL$LIBSSL'sv'_SHR'pz'    OSSL$SHARE'v':OSSL$LIBSSL'sv'_SHR'pz'.EXE
 $      IF P2 .NES. "NOALIASES"
 $      THEN
-$          DEF OSSL$INSTROOT   OSSL$INSTROOT'v'
-$          DEF OSSL$INCLUDE    OSSL$INCLUDE'v'
-$          DEF OSSL$LIB        OSSL$LIB'v'
-$          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 $config{no_shared} -}
-$       {- join("\n\$           ", map { "DEF  $_ $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
-$       {- output_on() -}
+$          DEF OSSL$INSTROOT           OSSL$INSTROOT'v'
+$          DEF OSSL$INCLUDE            OSSL$INCLUDE'v'
+$          DEF OSSL$LIB                OSSL$LIB'v'
+$          DEF OSSL$SHARE              OSSL$SHARE'v'
+$          DEF OSSL$ENGINES            OSSL$ENGINES'v'
+$          DEF OSSL$EXE                OSSL$EXE'v'
+$          DEF OSSL$LIBCRYPTO'pz'      OSSL$LIBCRYPTO'pz''v'
+$          DEF OSSL$LIBSSL'pz'         OSSL$LIBSSL'pz''v'
+$          DEF OSSL$LIBCRYPTO_SHR'pz'  OSSL$LIBCRYPTO'sv'_SHR'pz'
+$          DEF OSSL$LIBSSL_SHR'pz'     OSSL$LIBSSL'sv'_SHR'pz'
+$          DEF OPENSSL                 OSSL$INCLUDE:[OPENSSL]
 $      ENDIF
 $
-$      DEFT OSSL$DATAROOT      'OPENSSLDIR_'
+$      DEFT OSSL$DATAROOT      'OPENSSLDIR_']
 $      DEF  OSSL$CERTS         OSSL$DATAROOT:[CERTS]
 $      DEF  OSSL$PRIVATE       OSSL$DATAROOT:[PRIVATE]
 $