X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=VMS%2Fopenssl_startup.com.in;h=9e6e1c0b35bea0731ced801bd83bf854ea69fa99;hp=d2c46d9de21c1e1abafc28f37f6ec60a214775eb;hb=cffe973c45491b14d980e3b578da28e4a79a8705;hpb=a90f8d7641d89bf36203784527b298c117e41335

diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index d2c46d9de2..9e6e1c0b35 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -6,26 +6,33 @@ $	! defined by P1.
 $	!
 $	! The logical names created are:
 $	!
-$	!	OSSL$ROOTnnn	Installation root
-$	!	OSSL$EXEnnn	Where the executables are located
-$	!	OSSL$LIBnnn	Where the library files are located
-$	!	OSSL$SHAREnnn	Where the sahreable images are located
-$	!	OSSL$INCLUDEnnn	Include directory root
-$	!	OSSL$ENGINESnnn	Where the sahreable images are located
+$	!	OSSL$INSTROOT		Installation root
+$	!	OSSL$DATAROOT		Data root (common directory
+$	!				for certs etc)
+$	!	OSSL$INCLUDE		Include directory root
+$	!	OSSL$LIB		Where the static library files
+$	!				are located
+$	!	OSSL$SHARE		Where the shareable image files
+$	!				are located
+$	!	OSSL$EXE		Where the executables are located
+$	!	OSSL$ENGINESnnn		Where the shareable images are located
+$	!	OSSL$LIBCRYPTO		The static crypto library
+$	!	OSSL$LIBSSL		The static ssl library
+$	!	OSSL$LIBCRYPTOnnn_SHR	The shareable crypto image
+$	!	OSSL$LIBSSLnnn_SHR	The shareable ssl image
+$	!	OPENSSL			is OSSL$INCLUDE:[OPENSSL]
 $	!
 $	! In all these, nnn is the OpenSSL version number.  This allows
-$	! several OpenSSL versions to be installed simultaneously.
+$	! several OpenSSL versions to be installed simultaneously, which
+$	! matters for applications that are linked to the shareable images
+$	! or that depend on engines.
 $	!
 $	! In addition, unless P2 is "NOALIASES", these logical names are
 $	! created:
 $	!
-$	!	OSSL$ROOT	Alias for OSSL$ROOTnnn
-$	!	OSSL$EXE	Alias for OSSL$EXEnnn
-$	!	OSSL$LIB	Alias for OSSL$LIBnnn
-$	!	OSSL$SHARE	Alias for OSSL$SHAREnnn
-$	!	OSSL$INCLUDE	Alias for OSSL$INCLUDEnnn
-$	!	OPENSSL		is OSSL$INCLUDE:[OPENSSL]
-$	!	OSSL$ENGINES	Alias for OSSL$ENGINESnnn
+$	!	OSSL$ENGINES		Alias for OSSL$ENGINESnnn
+$	!	OSSL$LIBCRYPTO_SHR	Alias for OSSL$LIBCRYPTOnnn_SHR
+$	!	OSSL$LIBSSL_SHR		Alias for OSSL$LIBSSLnnn_SHR
 $	!
 $	! P1	Qualifier(s) for DEFINE.  "/SYSTEM" would be typical when
 $	!	calling this script from SYS$STARTUP:SYSTARTUP_VMS.COM,
@@ -60,6 +67,7 @@ $	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_']
 $
@@ -80,7 +88,7 @@ $
 $	! Abbrevs
 $	DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1'
 $	DEF  := DEFINE /NOLOG 'P1'
-$	sv   := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}
+$	sv   := {- sprintf "%02d%02d", split m|\.|, $config{shlib_version_number} -}
 $	pz   := {- $config{pointer_size} -}
 $
 $	DEFT OSSL$DATAROOT		'OPENSSLDIR_']
@@ -88,22 +96,28 @@ $	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$ENGINES'sv''pz'	OSSL$INSTROOT:[ENGINES'sv''pz'.'arch']
+$	DEF  OSSL$EXE			OSSL$INSTROOT:[EXE.'arch'],-
+					OSSL$INSTROOT:[EXE]
 $	DEF  OSSL$LIBCRYPTO'pz'		OSSL$LIB:OSSL$LIBCRYPTO'pz'.OLB
 $	DEF  OSSL$LIBSSL'pz'		OSSL$LIB:OSSL$LIBSSL'pz'.OLB
+${- output_off() if $config{no_shared}; "" -}
 $	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
+${- output_on() if $config{no_shared}; "" -}
 $	DEF  OPENSSL			OSSL$INCLUDE:[OPENSSL]
 $
 $	IF P2 .NES. "NOALIASES"
 $	THEN
-$	    DEF OSSL$ENGINES		OSSL$ENGINES'sv'
+$	    DEF OSSL$ENGINES'pz'	OSSL$ENGINES'sv''pz'
+${- output_off() if $config{no_shared}; "" -}
 $	    DEF OSSL$LIBCRYPTO_SHR'pz'	OSSL$LIBCRYPTO'sv'_SHR'pz'
 $	    DEF OSSL$LIBSSL_SHR'pz'	OSSL$LIBSSL'sv'_SHR'pz'
+${- output_on() if $config{no_shared}; "" -}
 $	ENDIF
 $
 $ bailout:
 $	DEASSIGN WRK_INSTALLTOP
+$	DEASSIGN WRK_OPENSSLDIR
 $
 $	EXIT 'status'