From bc2234f0c80985456dc17b76ed7dfe5cdde9188f Mon Sep 17 00:00:00 2001 From: marc <> Date: Thu, 8 Oct 1998 17:32:01 +0000 Subject: create /usr/include/ssl before trying to copy files into it. If you've had a recent build fail check /usr/include/ssl. if it is a file instead of a directory remove it and try again after updating with these changes. --- src/lib/libssl/crypto-patent/Makefile | 3 ++- src/lib/libssl/crypto/Makefile | 3 ++- src/lib/libssl/ssl-patent/Makefile | 1 + src/lib/libssl/ssl/Makefile | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/libssl/crypto-patent/Makefile b/src/lib/libssl/crypto-patent/Makefile index 74b98926f1..ba6d5aaa19 100644 --- a/src/lib/libssl/crypto-patent/Makefile +++ b/src/lib/libssl/crypto-patent/Makefile @@ -149,12 +149,13 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \ ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf \ ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa \ ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \ - ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ + ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/asn1 \ ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \ ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC} includes: + @install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ssl @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ j="cmp -s ${LCRYPTO_SRC}/$$i \ ${DESTDIR}/usr/include/ssl/`basename $$i` || \ diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile index 516609d8d1..2b4ef204a1 100644 --- a/src/lib/libssl/crypto/Makefile +++ b/src/lib/libssl/crypto/Makefile @@ -149,12 +149,13 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \ ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf \ ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa \ ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \ - ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ + ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/asn1 \ ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \ ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC} includes: + @install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ssl @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ j="cmp -s ${LCRYPTO_SRC}/$$i \ ${DESTDIR}/usr/include/ssl/`basename $$i` || \ diff --git a/src/lib/libssl/ssl-patent/Makefile b/src/lib/libssl/ssl-patent/Makefile index 09e9de7fb4..2ed039602f 100644 --- a/src/lib/libssl/ssl-patent/Makefile +++ b/src/lib/libssl/ssl-patent/Makefile @@ -64,6 +64,7 @@ HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h .PATH: ${LSSL_SRC} includes: + @install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ssl @cd ${LSSL_SRC}; for i in $(HDRS); do \ j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile index facbfa9ca7..95b4b42616 100644 --- a/src/lib/libssl/ssl/Makefile +++ b/src/lib/libssl/ssl/Makefile @@ -64,6 +64,7 @@ HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h .PATH: ${LSSL_SRC} includes: + @install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ssl @cd ${LSSL_SRC}; for i in $(HDRS); do \ j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ -- cgit v1.2.3-55-g6feb