Misc fixes in VMS/openssl_startup.com.in

[openssl.git] / VMS / openssl_startup.com.in

diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index a968b44d6c0f27ed2a29ebb174f5ad4e71ace97f..c3a0143e22643c52c7dd37f15ed665480aa4aa27 100644 (file)
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -46,7 +46,7 @@ $     IF F$GETSYI("CPU") .LT. 128
 $      THEN
 $          arch := VAX
 $      ELSE
-$          arch := F$EDIT(F$GETSYI("ARCH_NAME"),"UPCASE")
+$          arch = F$EDIT(F$GETSYI("ARCH_NAME"),"UPCASE")
 $          IF arch .EQS. "" THEN GOTO unknown_arch
 $      ENDIF
 $
@@ -54,14 +54,14 @@ $   ! Generated information
 $      VERSION := {- $config{version} -}
 $      INSTALLTOP := {- $config{INSTALLTOP} -}
 $      OPENSSLDIR := {- $config{OPENSSLDIR} -}
-$      POINTER_SIZE = {- $config{pointersize} -}
+$      POINTER_SIZE := {- $config{pointersize} -}
 $
 $      ! Make sure that INSTALLTOP and OPENSSLDIR become something one
 $      ! can build concealed logical names on
-$      INSTALLTOP_ = F$PARSE("A.;",INSTALLTOP,,,"NO_CONCEAL") - "A.;" -
-                    - ".][000000" - "[000000." - "][" - "]" + ".]"
-$      OPENSSLDIR_ = F$PARSE("A.;",OPENSSLDIR,,,"NO_CONCEAL") - "A.;" -
-                    - ".][000000" - "[000000." - "][" - "]" + ".]"
+$      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_'
 $
 $      ! Check that things are in place, and specifically, the stuff
@@ -70,7 +70,7 @@ $     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;1") .EQS. ""
+          .OR. F$SEARCH("WRK_INSTALLTOP:[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
@@ -88,7 +88,7 @@ $     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]
-$       {- output_off() if $config{no_shared} -}
+$       {- output_off() if $disabled{shared} -}
 $       {- join("\n\$       ", map { "DEF  $_'v' OSSL\$SHARE:$_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
 $       {- output_on() -}
 $      IF P2 .NES. "NOALIASES"
@@ -100,7 +100,7 @@ $       DEF OSSL$SHARE      OSSL$SHARE'v'
 $          DEF OSSL$ENGINES    OSSL$ENGINES'v'
 $          DEF OSSL$EXE        OSSL$EXE'v'
 $          DEF OPENSSL         OSSL$INCLUDE:[OPENSSL]
-$       {- output_off() if $config{no_shared} -}
+$       {- output_off() if $disabled{shared} -}
 $       {- join("\n\$           ", map { "DEF  $_ $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
 $       {- output_on() -}
 $      ENDIF