The previous take went wrong, try again.

diff --git a/crypto/install.com b/crypto/install.com
index 371767784931698a108f3bce8ce88e0b83f7ff13..ad3e4d48c7b3794b9dbd8c71d4c5a649799158a9 100644 (file)
--- a/crypto/install.com
+++ b/crypto/install.com
@@ -41,6 +41,7 @@ $     IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
           CREATE/DIR/LOG WRK_SSLINCLUDE:
 $
 $      SDIRS := ,-
           CREATE/DIR/LOG WRK_SSLINCLUDE:
 $
 $      SDIRS := ,-

+                _'ARCH',-

                 OBJECTS,-
                 MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
                 DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-
                 OBJECTS,-
                 MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
                 DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-


@@ -49,8 +50,8 @@ $     SDIRS := ,-
                 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-
                 UI,KRB5,-
                 STORE,CMS,PQUEUE,TS,JPAKE
                 EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-
                 UI,KRB5,-
                 STORE,CMS,PQUEUE,TS,JPAKE

-$      EXHEADER_ := crypto.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,-
-               ossl_typ.h
+$      EXHEADER_ := crypto.h,opensslv.h,ebcdic.h,symhacks.h,ossl_typ.h
+$      EXHEADER__'ARCH' := opensslconf.h

 $      EXHEADER_OBJECTS := objects.h,obj_mac.h
 $      EXHEADER_MD2 := md2.h
 $      EXHEADER_MD4 := md4.h
 $      EXHEADER_OBJECTS := objects.h,obj_mac.h
 $      EXHEADER_MD2 := md2.h
 $      EXHEADER_MD4 := md4.h


@@ -117,13 +118,14 @@ $ IF D .EQS. "," THEN GOTO LOOP_SDIRS_END
 $      tmp = EXHEADER_'D'
 $      IF D .EQS. ""
 $      THEN
 $      tmp = EXHEADER_'D'
 $      IF D .EQS. ""
 $      THEN

-$        ! If we don't find a file in the source directory, it's most
-$        ! probably generated for each architecture
-$        ! (opensslconf.h, for example)
-$        IF F$SEARCH("''tmp'") .EQS. "" THEN tmp = "[-.''ARCH'.CRYPTO]''tmp'"

 $        COPY 'tmp' WRK_SSLINCLUDE: /LOG
 $      ELSE
 $        COPY 'tmp' WRK_SSLINCLUDE: /LOG
 $      ELSE

-$        COPY [.'D']'tmp' WRK_SSLINCLUDE: /LOG
+$        IF D .EQS. "_''ARCH'"
+$        THEN
+$          COPY [-.'ARCH'.CRYPTO]'tmp' WRK_SSLINCLUDE: /LOG
+$        ELSE
+$          COPY [.'D']'tmp' WRK_SSLINCLUDE: /LOG
+$        ENDIF

 $      ENDIF
 $      SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'tmp'
 $      GOTO LOOP_SDIRS
 $      ENDIF
 $      SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'tmp'
 $      GOTO LOOP_SDIRS

diff --git a/makevms.com b/makevms.com
index 529eba9f33b4d12889394e4a3f504e6ff285dbfa..ecaf67cacd00e79747b24077a62a94f611194370 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -457,7 +457,7 @@ $!
 $! Copy All The ".H" Files From The [.CRYPTO] Directory Tree.
 $!
 $ SDIRS := ,-
 $! Copy All The ".H" Files From The [.CRYPTO] Directory Tree.
 $!
 $ SDIRS := ,-

-   'ARCH',-
+   _'ARCH',-

    OBJECTS,-
    MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
    DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,MODES,-
    OBJECTS,-
    MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
    DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,MODES,-


@@ -465,7 +465,8 @@ $ SDIRS := ,-
    BUFFER,BIO,STACK,LHASH,RAND,ERR,-
    EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,-
    STORE,CMS,PQUEUE,TS,JPAKE
    BUFFER,BIO,STACK,LHASH,RAND,ERR,-
    EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,-
    STORE,CMS,PQUEUE,TS,JPAKE

-$ EXHEADER_ := crypto.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,ossl_typ.h
+$ EXHEADER_ := crypto.h,opensslv.h,ebcdic.h,symhacks.h,ossl_typ.h
+$ EXHEADER__'ARCH' := opensslconf.h

 $ EXHEADER_OBJECTS := objects.h,obj_mac.h
 $ EXHEADER_MD2 := md2.h
 $ EXHEADER_MD4 := md4.h
 $ EXHEADER_OBJECTS := objects.h,obj_mac.h
 $ EXHEADER_MD2 := md2.h
 $ EXHEADER_MD4 := md4.h


@@ -529,17 +530,13 @@ $ IF D .EQS. "," THEN GOTO LOOP_SDIRS_END
 $ tmp = EXHEADER_'D'
 $ IF D .EQS. ""
 $ THEN
 $ tmp = EXHEADER_'D'
 $ IF D .EQS. ""
 $ THEN

-$   ! If we don't find a file in the source directory, it's most
-$   ! probably generated for each architecture
-$   ! (opensslconf.h, for example)
-$   IF F$SEARCH("[.CRYPTO]''tmp'") .EQS. ""
-$   THEN
+$   COPY [.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
+$ ELSE
+$   IF D .EQS. "_''ARCH'" THEN

 $     COPY [.'ARCH'.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
 $   ELSE
 $     COPY [.'ARCH'.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
 $   ELSE

-$     COPY [.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
+$     COPY [.CRYPTO.'D']'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG

 $   ENDIF
 $   ENDIF

-$ ELSE
-$   COPY [.CRYPTO.'D']'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG

 $ ENDIF
 $ GOTO LOOP_SDIRS
 $ LOOP_SDIRS_END:
 $ ENDIF
 $ GOTO LOOP_SDIRS
 $ LOOP_SDIRS_END: