Versioning engines default location: the VMS case

OpenSSL engines are tied to the OpenSSL shared library versions,
starting with OpenSSL 1.1.  We therefore need to install them in
directories which have the shared library version in it's name, to
easily allow multiple OpenSSL versions to be installed at the same
time.

For VMS, the change is a bit more involved, primarly because the top
installation directory was already versioned, *as well as* some of the
files inside.  That's a bit too much.  Version numbering in files is
also a bit different on VMS.  The engines for shared library version
1.1 will therefore end up in OSSL$INSTROOT:[ENGINES0101.'arch']

('arch' is the architecture we build for)

Reviewed-by: Rich Salz <rsalz@openssl.org>

2 files changed, 20 insertions, 34 deletions

diff --git a/VMS/openssl_shutdown.com.in b/VMS/openssl_shutdown.com.in
index 01971f3667..f27d8556cd 100644
--- a/VMS/openssl_shutdown.com.in
+++ b/VMS/openssl_shutdown.com.in
@@ -30,29 +30,22 @@ $	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'
-$	DEAS OSSL$LIB'v'
-$	DEAS OSSL$SHARE'v'
-$	DEAS OSSL$ENGINES'v'
-$	DEAS OSSL$EXE'v'
-$	DEAS OSSL$LIBCRYPTO'pz''v'
-$	DEAS OSSL$LIBSSL'pz''v'
+$	DEAS OSSL$INSTROOT
+$	DEAS OSSL$INCLUDE
+$	DEAS OSSL$LIB
+$	DEAS OSSL$SHARE
+$	DEAS OSSL$ENGINES'sv'
+$	DEAS OSSL$EXE
+$	DEAS OSSL$LIBCRYPTO'pz'
+$	DEAS OSSL$LIBSSL'pz'
 $	DEAS OSSL$LIBCRYPTO'sv'_SHR'pz'
 $	DEAS OSSL$LIBSSL'sv'_SHR'pz'
 $	IF P2 .NES. "NOALIASES"
 $	THEN
-$	    DEAS OSSL$ROOT
-$	    DEAS OSSL$INCLUDE
-$	    DEAS OSSL$LIB
-$	    DEAS OSSL$SHARE
 $	    DEAS OSSL$ENGINES
-$	    DEAS OSSL$EXE
-$	    DEAS OPENSSL
-$	    DEAS OSSL$LIBCRYPTO'pz'
-$	    DEAS OSSL$LIBSSL'pz'
 $	    DEAS OSSL$LIBCRYPTO_SHR'pz'
 $	    DEAS OSSL$LIBSSL_SHR'pz'
+$	    DEAS OPENSSL
 $	ENDIF
 $
 $	EXIT 'status'
diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index b5570eecac..8ec35f0ef2 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -84,26 +84,19 @@ $	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'		'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
+$	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
 $	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]