summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormarc <>1998-10-08 17:51:49 +0000
committermarc <>1998-10-08 17:51:49 +0000
commitb647df8faf667360e246a8053e6ea31ae9612e58 (patch)
tree59c073448e5d93a5c920b6f5d32c5567530975d8 /src
parentbc2234f0c80985456dc17b76ed7dfe5cdde9188f (diff)
downloadopenbsd-b647df8faf667360e246a8053e6ea31ae9612e58.tar.gz
openbsd-b647df8faf667360e246a8053e6ea31ae9612e58.tar.bz2
openbsd-b647df8faf667360e246a8053e6ea31ae9612e58.zip
back out previous change. Theo says:
marc, this is wrong. mtree builds that directory. we never do mkdir's in makefiles. You also should not have modified ANY of those Makefiles, since they are part of the ssl distribution. please undo this change. And I say: developers, be sure to do a mkdir /usr/include/ssl before a bake build as include files are installed as the 2nd step.
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, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/crypto-patent/Makefile b/src/lib/libssl/crypto-patent/Makefile
index ba6d5aaa19..74b98926f1 100644
--- a/src/lib/libssl/crypto-patent/Makefile
+++ b/src/lib/libssl/crypto-patent/Makefile
@@ -149,13 +149,12 @@ 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
159 @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ 158 @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
160 j="cmp -s ${LCRYPTO_SRC}/$$i \ 159 j="cmp -s ${LCRYPTO_SRC}/$$i \
161 ${DESTDIR}/usr/include/ssl/`basename $$i` || \ 160 ${DESTDIR}/usr/include/ssl/`basename $$i` || \
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index 2b4ef204a1..516609d8d1 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -149,13 +149,12 @@ 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
159 @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ 158 @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \
160 j="cmp -s ${LCRYPTO_SRC}/$$i \ 159 j="cmp -s ${LCRYPTO_SRC}/$$i \
161 ${DESTDIR}/usr/include/ssl/`basename $$i` || \ 160 ${DESTDIR}/usr/include/ssl/`basename $$i` || \
diff --git a/src/lib/libssl/ssl-patent/Makefile b/src/lib/libssl/ssl-patent/Makefile
index 2ed039602f..09e9de7fb4 100644
--- a/src/lib/libssl/ssl-patent/Makefile
+++ b/src/lib/libssl/ssl-patent/Makefile
@@ -64,7 +64,6 @@ 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
68 @cd ${LSSL_SRC}; for i in $(HDRS); do \ 67 @cd ${LSSL_SRC}; for i in $(HDRS); do \
69 j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \ 68 j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \
70 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ 69 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 95b4b42616..facbfa9ca7 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -64,7 +64,6 @@ 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
68 @cd ${LSSL_SRC}; for i in $(HDRS); do \ 67 @cd ${LSSL_SRC}; for i in $(HDRS); do \
69 j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \ 68 j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \
70 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ 69 ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \