VMS: Simplify the spec of the default certs & keys area.

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

diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index c22dbfc9c9323099459eddff0cf42a8983de0abb..d2c46d9de21c1e1abafc28f37f6ec60a214775eb 100644 (file)
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -57,11 +57,11 @@ $
 $      ! 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
@@ -80,39 +80,29 @@ $
 $      ! Abbrevs
 $      DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1'
 $      DEF  := DEFINE /NOLOG 'P1'
-$      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'v':[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
+$      DEFT OSSL$DATAROOT              'OPENSSLDIR_']
+$      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]
+$
 $      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 OSSL$LIBCRYPTO'pz'      OSSL$LIBCRYPTO'pz''v'
-$          DEF OSSL$LIBSSL'pz'         OSSL$LIBSSL'pz''v'
+$          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'
-$          DEF OPENSSL                 OSSL$INCLUDE:[OPENSSL]
 $      ENDIF
 $
-$      DEFT OSSL$DATAROOT      'OPENSSLDIR_'
-$      DEF  OSSL$CERTS         OSSL$DATAROOT:[CERTS]
-$      DEF  OSSL$PRIVATE       OSSL$DATAROOT:[PRIVATE]
-$
 $ bailout:
 $      DEASSIGN WRK_INSTALLTOP
 $