Pass down correct information to the VMS startup script templates

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

diff --git a/VMS/openssl_startup.com.in b/VMS/openssl_startup.com.in
index c3a0143e22643c52c7dd37f15ed665480aa4aa27..f9350b00df23bb42a8a4f2a33aa08e01e3d813bb 100644 (file)
--- a/VMS/openssl_startup.com.in
+++ b/VMS/openssl_startup.com.in
@@ -51,10 +51,8 @@ $        IF arch .EQS. "" THEN GOTO unknown_arch
 $      ENDIF
 $
 $      ! Generated information
-$      VERSION := {- $config{version} -}
 $      INSTALLTOP := {- $config{INSTALLTOP} -}
 $      OPENSSLDIR := {- $config{OPENSSLDIR} -}
-$      POINTER_SIZE := {- $config{pointersize} -}
 $
 $      ! Make sure that INSTALLTOP and OPENSSLDIR become something one
 $      ! can build concealed logical names on
@@ -63,14 +61,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
@@ -80,17 +80,17 @@ $
 $      ! Abbrevs
 $      DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1'
 $      DEF  := DEFINE /NOLOG 'P1'
-$      v    =  VERSION - "." - "."
+$      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:[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]
-$       {- output_off() if $disabled{shared} -}
-$       {- join("\n\$       ", map { "DEF  $_'v' OSSL\$SHARE:$_" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
-$       {- output_on() -}
+$      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']
+$       {- join("\n\$       ", map { my $x = uc $_; "DEF  ${x}'v' OSSL\$SHARE:${x}" } @{$config{shared_libs}}) -}
 $      IF P2 .NES. "NOALIASES"
 $      THEN
 $          DEF OSSL$INSTROOT   OSSL$INSTROOT'v'
@@ -100,9 +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 $disabled{shared} -}
-$       {- join("\n\$           ", map { "DEF  $_ $_'v'" } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) -}
-$       {- output_on() -}
+$           {- join("\n\$           ", map { my $x = uc $_; "DEF ${x} ${x}'v'" } @{$config{shared_libs}}) -}
 $      ENDIF
 $
 $      DEFT OSSL$DATAROOT      'OPENSSLDIR_'