diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-11-18 23:30:38 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-11-18 23:30:38 +0000 |
| commit | 0ec28bb237d972871d7c7f5be98a57f16ff00925 (patch) | |
| tree | 020c1c29b7006e507a4d2937eb49302960a1ba00 /lib | |
| parent | 556168fa9898373687ebf8d3b8b9904a7d8d74ba (diff) | |
"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 'lib')
| -rw-r--r-- | lib/libssl/crypto/Makefile | 14 | ||||
| -rw-r--r-- | lib/libssl/ssl/Makefile | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile index fc1a092225b..e2c1c4f858a 100644 --- a/lib/libssl/crypto/Makefile +++ b/lib/libssl/crypto/Makefile @@ -164,14 +164,18 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \ ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC} includes: - @cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ - j="cmp -s ${LCRYPTO_SRC}/$$i \ - ${DESTDIR}/usr/include/ssl/`basename $$i` || \ + @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \ + cd ${LCRYPTO_SRC}; for i in $(HDRS); do \ + f=`basename $$i`; \ + j="sed 's/#include \"\\([^\"]*\\)\"/#include <ssl\\/\\1>/' \ + ${LCRYPTO_SRC}/$$i >$$d/$$f && \ + (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${LCRYPTO_SRC}/$$i ${DESTDIR}/usr/include/ssl"; \ + $$d/$$f ${DESTDIR}/usr/include/ssl)"; \ echo $$j; \ eval "$$j"; \ - done + done; \ + rm -rf $$d .include <bsd.lib.mk> diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile index 6fffdd9ef22..02bec28066b 100644 --- a/lib/libssl/ssl/Makefile +++ b/lib/libssl/ssl/Makefile @@ -73,13 +73,17 @@ HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h .PATH: ${LSSL_SRC} includes: - @cd ${LSSL_SRC}; for i in $(HDRS); do \ - j="cmp -s $$i ${DESTDIR}/usr/include/ssl/`basename $$i` || \ + @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \ + cd ${LSSL_SRC}; for i in $(HDRS); do \ + f=`basename $$i`; \ + j="sed 's/#include \"\\([^\"]*\\)\"/#include <ssl\\/\\1>/' \ + $$i >$$d/$$f && \ + (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - $$i ${DESTDIR}/usr/include/ssl"; \ + $$d/$$f ${DESTDIR}/usr/include/ssl)"; \ echo $$j; \ eval "$$j"; \ - done - + done; \ + rm -rf $$d .include <bsd.lib.mk> |