diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-29 20:02:15 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-29 20:26:43 +0200 |
| commit | 85112d53c5d43f99f4efe899c66ef858246f512e (patch) | |
| tree | 0a0d3a9a6f6cdeebffcb5c4168369e58ef8e7074 /VMS | |
| parent | 40ea24b081c988bd3db5876a48e82580966aa04f (diff) | |
| download | openssl-new-85112d53c5d43f99f4efe899c66ef858246f512e.tar.gz | |
VMS: Harmonize the paths in openssl_startup.com with what's really installed
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'VMS')
| -rw-r--r-- | VMS/openssl_startup.com.in | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in index c3a0143e22..caad02278b 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() -} |