The branch master has been updated
via 85112d53c5d43f99f4efe899c66ef858246f512e (commit)
via 40ea24b081c988bd3db5876a48e82580966aa04f (commit)
from fe56d8e8a3665dc7e6784e0c170f790e6df8153f (commit)
- Log -----------------------------------------------------------------
commit 85112d53c5d43f99f4efe899c66ef858246f512e
Author: Richard Levitte <[email protected]>
Date: Tue Mar 29 20:02:15 2016 +0200
VMS: Harmonize the paths in openssl_startup.com with what's really installed
Reviewed-by: Rich Salz <[email protected]>
commit 40ea24b081c988bd3db5876a48e82580966aa04f
Author: Richard Levitte <[email protected]>
Date: Tue Mar 29 20:01:33 2016 +0200
VMS: Display the correct path to openssl_startup.com and openssl-utils.com
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 9 ++++++---
VMS/openssl_startup.com.in | 18 ++++++++++--------
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index b136611..174b954 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -120,7 +120,10 @@ DESTDIR=
# Do not edit this manually. Use Configure --prefix=DIR to change this!
INSTALLTOP={- (my $x = $config{version}) =~ s|\.|_|g;
- catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL-$x]" -}
+ our $installtop =
+ catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL-$x]";
+ $installtop -}
+SYSTARTUP={- catdir($installtop, '[.SYS$STARTUP]'); -}
# This is the standard central area to store certificates, private keys...
OPENSSLDIR={- catdir($config{openssldir}) ||
$config{prefix} ? catdir($config{prefix},"COMMON")
@@ -266,8 +269,8 @@ install : install_sw install_docs
WRITE SYS$OUTPUT "ends up in $(OPENSSLDIR)" ; -
WRITE SYS$OUTPUT "" ; -
WRITE SYS$OUTPUT "When in its final destination," ; -
- WRITE SYS$OUTPUT "Run @$(INSTALLTOP)openssl_startup to set
up logical names" ; -
- WRITE SYS$OUTPUT "then run @$(INSTALLTOP)openssl_setup to
define commands" ; -
+ WRITE SYS$OUTPUT "Run @$(SYSTARTUP)openssl_startup to set
up logical names" ; -
+ WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils to
define commands" ; -
WRITE SYS$OUTPUT "" )
uninstall : uninstall_docs uninstall_sw
diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index c3a0143..caad022 100644
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -63,14 +63,16 @@ $ INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") -
$ OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") -
- ".][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
$ IF F$SEARCH("WRK_INSTALLTOP:[000000]INCLUDE.DIR;1") .EQS. "" -
- .OR. F$SEARCH("WRK_INSTALLTOP:[000000]''arch'.DIR;1") .EQS. "" -
- .OR. F$SEARCH("WRK_INSTALLTOP:[''arch']LIB.DIR;1") .EQS. "" -
- .OR. F$SEARCH("WRK_INSTALLTOP:[''arch']EXE.DIR;1") .EQS. "" -
- .OR. F$SEARCH("WRK_INSTALLTOP:[000000]openssl.cnf") .EQS. ""
+ .OR. F$SEARCH("WRK_INSTALLTOP:[000000]LIB.DIR;1") .EQS. "" -
+ .OR. F$SEARCH("WRK_INSTALLTOP:[000000]EXE.DIR;1") .EQS. "" -
+ .OR. F$SEARCH("WRK_INSTALLTOP:[LIB]''arch'.DIR;1") .EQS. "" -
+ .OR. F$SEARCH("WRK_INSTALLTOP:[EXE]''arch'.DIR;1") .EQS. "" -
+ .OR. F$SEARCH("WRK_OPENSSLDIR:[000000]openssl.cnf") .EQS. ""
$ THEN
$ WRITE SYS$ERROR "''INSTALLTOP' doesn't look like an OpenSSL
installation for ''arch'"
$ status = %x00018292 ! RMS$_FNF, file not found
@@ -84,10 +86,10 @@ $ v = VERSION - "." - "."
$
$ DEFT OSSL$INSTROOT'v' 'INSTALLTOP_'
$ DEFT OSSL$INCLUDE'v' OSSL$INSTROOT:[INCLUDE.]
-$ DEF OSSL$LIB'v' OSSL$INSTROOT:['arch'.LIB]
-$ DEF OSSL$SHARE'v' OSSL$INSTROOT:['arch'.LIB]
-$ DEF OSSL$ENGINES'v' OSSL$INSTROOT:['arch'.ENGINES]
-$ DEF OSSL$EXE'v' OSSL$INSTROOT:['arch'.EXE]
+$ 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']
$ {- output_off() if $disabled{shared} -}
$ {- join("\n\$ ", map { "DEF $_'v' OSSL\$SHARE:$_" } map {
$unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
$ {- output_on() -}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
