Prevent ERR_print_errors_fp crash on Win32 [from HEAD].

[oweals/openssl.git] / crypto / install.com

diff --git a/crypto/install.com b/crypto/install.com
index ffad1f97a72ffffd9b0bf2cff0e34a8a6edc6a53..5e6d97e5375de463e0ea21f2ae2c7940ee0c1bf9 100644 (file)
--- a/crypto/install.com
+++ b/crypto/install.com
@@ -3,15 +3,26 @@ $!
 $! Author: Richard Levitte <richard@levitte.org>
 $! Time of creation: 22-MAY-1998 10:13
 $!
+$! Changes by Zoltan Arpadffy <zoli@polarhome.com>
+$!
 $! P1  root of the directory tree
 $!
 $      IF P1 .EQS. ""
 $      THEN
 $          WRITE SYS$OUTPUT "First argument missing."
-$          WRITE SYS$OUTPUT "Should be the directory where you want things installed."
+$          WRITE SYS$OUTPUT -
+                 "It should be the directory where you want things installed."
 $          EXIT
 $      ENDIF
 $
+$      IF (F$GETSYI("CPU").LT.128)
+$      THEN
+$          ARCH := VAX
+$      ELSE
+$          ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
+$          IF (ARCH .EQS. "") THEN ARCH = "UNK"
+$      ENDIF
+$
 $      ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
 $      ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
 $      ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
@@ -19,16 +30,13 @@ $   ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
 $      ROOT = ROOT_DEV + "[" + ROOT_DIR
 $
 $      DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$      DEFINE/NOLOG WRK_SSLVLIB WRK_SSLROOT:[VAX_LIB]
-$      DEFINE/NOLOG WRK_SSLALIB WRK_SSLROOT:[ALPHA_LIB]
+$      DEFINE/NOLOG WRK_SSLLIB WRK_SSLROOT:['ARCH'_LIB]
 $      DEFINE/NOLOG WRK_SSLINCLUDE WRK_SSLROOT:[INCLUDE]
 $
 $      IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
           CREATE/DIR/LOG WRK_SSLROOT:[000000]
-$      IF F$PARSE("WRK_SSLVLIB:") .EQS. "" THEN -
-          CREATE/DIR/LOG WRK_SSLVLIB:
-$      IF F$PARSE("WRK_SSLALIB:") .EQS. "" THEN -
-          CREATE/DIR/LOG WRK_SSLALIB:
+$      IF F$PARSE("WRK_SSLLIB:") .EQS. "" THEN -
+          CREATE/DIR/LOG WRK_SSLLIB:
 $      IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
           CREATE/DIR/LOG WRK_SSLINCLUDE:
 $
@@ -95,8 +103,7 @@ $    EXHEADER_PQUEUE := pqueue.h,pq_compat.h
 $      EXHEADER_JPAKE := jpake.h
 $      LIBS := LIBCRYPTO
 $
-$      VEXE_DIR := [-.VAX.EXE.CRYPTO]
-$      AEXE_DIR := [-.AXP.EXE.CRYPTO]
+$      EXE_DIR := [-.'ARCH'.EXE.CRYPTO]
 $
 $      I = 0
 $ LOOP_SDIRS: 
@@ -120,27 +127,16 @@ $ E = F$EDIT(F$ELEMENT(I, ",", LIBS),"TRIM")
 $      I = I + 1
 $      IF E .EQS. "," THEN GOTO LOOP_LIB_END
 $      SET NOON
-$      IF F$SEARCH(VEXE_DIR+E+".OLB") .NES. ""
-$      THEN
-$        COPY 'VEXE_DIR''E'.OLB WRK_SSLVLIB:'E'.OLB/log
-$        SET FILE/PROT=W:RE WRK_SSLVLIB:'E'.OLB
-$      ENDIF
-$      ! Preparing for the time when we have shareable images
-$      IF F$SEARCH(VEXE_DIR+E+".EXE") .NES. ""
-$      THEN
-$        COPY 'VEXE_DIR''E'.EXE WRK_SSLVLIB:'E'.EXE/log
-$        SET FILE/PROT=W:RE WRK_SSLVLIB:'E'.EXE
-$      ENDIF
-$      IF F$SEARCH(AEXE_DIR+E+".OLB") .NES. ""
+$      IF F$SEARCH(EXE_DIR+E+".OLB") .NES. ""
 $      THEN
-$        COPY 'AEXE_DIR''E'.OLB WRK_SSLALIB:'E'.OLB/log
-$        SET FILE/PROT=W:RE WRK_SSLALIB:'E'.OLB
+$        COPY 'EXE_DIR''E'.OLB WRK_SSLLIB:'E'.OLB/log
+$        SET FILE/PROT=W:RE WRK_SSLLIB:'E'.OLB
 $      ENDIF
 $      ! Preparing for the time when we have shareable images
-$      IF F$SEARCH(AEXE_DIR+E+".EXE") .NES. ""
+$      IF F$SEARCH(EXE_DIR+E+".EXE") .NES. ""
 $      THEN
-$        COPY 'AEXE_DIR''E'.EXE WRK_SSLALIB:'E'.EXE/log
-$        SET FILE/PROT=W:RE WRK_SSLALIB:'E'.EXE
+$        COPY 'EXE_DIR''E'.EXE WRK_SSLLIB:'E'.EXE/log
+$        SET FILE/PROT=W:RE WRK_SSLLIB:'E'.EXE
 $      ENDIF
 $      SET ON
 $      GOTO LOOP_LIB