summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormarc <>1998-10-08 17:32:01 +0000
committermarc <>1998-10-08 17:32:01 +0000
commitbc2234f0c80985456dc17b76ed7dfe5cdde9188f (patch)
tree8faf949c14ab1eca9467a21907e4d282f6278185 /src
parente98ba461fd1db2f68207f31fa0c6c101b027b626 (diff)
downloadopenbsd-bc2234f0c80985456dc17b76ed7dfe5cdde9188f.tar.gz
openbsd-bc2234f0c80985456dc17b76ed7dfe5cdde9188f.tar.bz2
openbsd-bc2234f0c80985456dc17b76ed7dfe5cdde9188f.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/crypto-patent/Makefile3
-rw-r--r--src/lib/libssl/crypto/Makefile3
-rw-r--r--src/lib/libssl/ssl-patent/Makefile1
-rw-r--r--src/lib/libssl/ssl/Makefile1
4 files changed, 6 insertions, 2 deletions
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 \
149 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf \ 149 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf \
150 ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa \ 150 ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa \
151 ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \ 151 ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \
152 ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ 152 ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \
153 ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/asn1 \ 153 ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/asn1 \
154 ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \ 154 ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \
155 ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC} 155 ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}
156 156
157includes: 157includes:
158 @install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ssl
158 @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ 159 @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
159 j="cmp -s ${LCRYPTO_SRC}/$$i \ 160 j="cmp -s ${LCRYPTO_SRC}/$$i \
160 ${DESTDIR}/usr/include/ssl/`basename $$i` || \ 161 ${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 \
149 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf \ 149 ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf \
150 ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa \ 150 ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa \
151 ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \ 151 ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \
152 ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ 152 ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \
153 ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/asn1 \ 153 ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/asn1 \
154 ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \ 154 ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \
155 ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC} 155 ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}
156 156
157includes: 157includes:
158 @install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ssl
158 @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ 159 @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
159 j="cmp -s ${LCRYPTO_SRC}/$$i \ 160 j="cmp -s ${LCRYPTO_SRC}/$$i \
160 ${DESTDIR}/usr/include/ssl/`basename $$i` || \ 161 ${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
64.PATH: ${LSSL_SRC} 64.PATH: ${LSSL_SRC}
65 65
66includes: 66includes:
67 @install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ssl
67 @cd ${LSSL_SRC}; for i in $(HDRS); do \ 68 @cd ${LSSL_SRC}; for i in $(HDRS); do \
68 j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \ 69 j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \
69 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ 70 ${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
64.PATH: ${LSSL_SRC} 64.PATH: ${LSSL_SRC}
65 65
66includes: 66includes:
67 @install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/include/ssl
67 @cd ${LSSL_SRC}; for i in $(HDRS); do \ 68 @cd ${LSSL_SRC}; for i in $(HDRS); do \
68 j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \ 69 j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \
69 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ 70 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 05:17:09 +0000