From d17d3293d112c3f32ac187ab7c33bb3a2c44ddba Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sat, 2 Jul 2016 08:47:08 +0200
Subject: Fix some VMS inconsistencies

- The install top is versioned by default.  However, only the major
  version should be used.
- the default areas for certs, private keys an config files have
  changed, now all prefixed with 'OSSL$'.  This gets reflected in
  cryptlib.h.
- [.VMS]openssl_startup.com.in had some faults regarding creating
  rooted concealed logical names.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 VMS/openssl_startup.com.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'VMS')

diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index c22dbfc9c9..b5570eecac 100644
--- 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
@@ -84,8 +84,8 @@ $	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.]
+$	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']
@@ -109,7 +109,7 @@ $	    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]
 $
-- 
cgit v1.2.3