diff options
author | niklas <> | 1998-11-18 23:30:37 +0000 |
---|---|---|
committer | niklas <> | 1998-11-18 23:30:37 +0000 |
commit | 5a11336d3f08469f2747ebcf26ae777dba46fd22 (patch) | |
tree | f9831f1e75dfbe62b803e9e7d8915262ecf543d9 /src/lib/libssl/crypto | |
parent | 3151af1d061bb26374953fe7517461c0457d521c (diff) | |
download | openbsd-5a11336d3f08469f2747ebcf26ae777dba46fd22.tar.gz openbsd-5a11336d3f08469f2747ebcf26ae777dba46fd22.tar.bz2 openbsd-5a11336d3f08469f2747ebcf26ae777dba46fd22.zip |
"foo.h" -> <ssl/foo.h> in ssl includes, so we do not need -I/usr/include/ssl
and we won't be bothered by nameclashes with application headers
Diffstat (limited to 'src/lib/libssl/crypto')
-rw-r--r-- | src/lib/libssl/crypto/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile index fc1a092225..e2c1c4f858 100644 --- a/src/lib/libssl/crypto/Makefile +++ b/src/lib/libssl/crypto/Makefile | |||
@@ -164,14 +164,18 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \ | |||
164 | ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC} | 164 | ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC} |
165 | 165 | ||
166 | includes: | 166 | includes: |
167 | @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ | 167 | @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \ |
168 | j="cmp -s ${LCRYPTO_SRC}/$$i \ | 168 | cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ |
169 | ${DESTDIR}/usr/include/ssl/`basename $$i` || \ | 169 | f=`basename $$i`; \ |
170 | j="sed 's/#include \"\\([^\"]*\\)\"/#include <ssl\\/\\1>/' \ | ||
171 | ${LCRYPTO_SRC}/$$i >$$d/$$f && \ | ||
172 | (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \ | ||
170 | ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ | 173 | ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ |
171 | ${LCRYPTO_SRC}/$$i ${DESTDIR}/usr/include/ssl"; \ | 174 | $$d/$$f ${DESTDIR}/usr/include/ssl)"; \ |
172 | echo $$j; \ | 175 | echo $$j; \ |
173 | eval "$$j"; \ | 176 | eval "$$j"; \ |
174 | done | 177 | done; \ |
178 | rm -rf $$d | ||
175 | 179 | ||
176 | 180 | ||
177 | .include <bsd.lib.mk> | 181 | .include <bsd.lib.mk> |