VMS: defined the logical name OPENSSL at all times

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

diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index e5043b5bb0c254210ccbb3123d1c28e505a14f85..ca2220efe75c42b5faf422d06fd790b9adc315fc 100644 (file)
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -51,19 +51,17 @@ $       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") -
-                    - ".][000000" - "[000000." - "][" - "]A.;" + ".]"
+                    - ".][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_'
+                    - ".][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
@@ -82,28 +80,29 @@ $
 $      ! Abbrevs
 $      DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1'
 $      DEF  := DEFINE /NOLOG 'P1'
-$      v    =  VERSION - "." - "."
+$      sv   := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}
+$      pz   := {- $config{pointer_size} -}
+$
+$      DEFT OSSL$INSTROOT              'INSTALLTOP_']
+$      DEFT OSSL$INCLUDE               'INSTALLTOP_'INCLUDE.]
+$      DEF  OSSL$LIB                   OSSL$INSTROOT:[LIB.'arch']
+$      DEF  OSSL$SHARE                 OSSL$INSTROOT:[LIB.'arch']
+$      DEF  OSSL$ENGINES'sv'           OSSL$INSTROOT:[ENGINES'sv'.'arch']
+$      DEF  OSSL$EXE                   OSSL$INSTROOT:[EXE.'arch']
+$      DEF  OSSL$LIBCRYPTO'pz'         OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB
+$      DEF  OSSL$LIBSSL'pz'            OSSL$LIB:OSSL$LIBSSL'pz'.OLB
+$      DEF  OSSL$LIBCRYPTO'sv'_SHR'pz' OSSL$SHARE:OSSL$LIBCRYPTO'sv'_SHR'pz'.EXE
+$      DEF  OSSL$LIBSSL'sv'_SHR'pz'    OSSL$SHARE:OSSL$LIBSSL'sv'_SHR'pz'.EXE
+$      DEF  OPENSSL                    OSSL$INCLUDE:[OPENSSL]
 $
-$      DEFT OSSL$INSTROOT'v'   'INSTALLTOP_'
-$      DEFT OSSL$INCLUDE'v'    OSSL$INSTROOT:[INCLUDE.]
-$      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']
-$       {- 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'
-$          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]
-$           {- join("\n\$           ", map { my $x = uc $_; "DEF ${x} ${x}'v'" } @{$config{shared_libs}}) -}
+$          DEF OSSL$ENGINES            OSSL$ENGINES'sv'
+$          DEF OSSL$LIBCRYPTO_SHR'pz'  OSSL$LIBCRYPTO'sv'_SHR'pz'
+$          DEF OSSL$LIBSSL_SHR'pz'     OSSL$LIBSSL'sv'_SHR'pz'
 $      ENDIF
 $
-$      DEFT OSSL$DATAROOT      'OPENSSLDIR_'
+$      DEFT OSSL$DATAROOT      'OPENSSLDIR_']
 $      DEF  OSSL$CERTS         OSSL$DATAROOT:[CERTS]
 $      DEF  OSSL$PRIVATE       OSSL$DATAROOT:[PRIVATE]
 $