diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2003-06-02 08:45:59 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-06-02 08:45:59 +0000 |
| commit | 0a5995a77a8c72cefdae57532fbe56d5c33a007a (patch) | |
| tree | cbc224729aa8c1c67c5d24f9fb4a4b6daa6b2427 /lib/libssl | |
| parent | e36ba32f1078c15d63545f96c7d7a0bc962ced33 (diff) | |
swap /usr/include/openssl and /usr/include/ssl, clean up the Makefiles
get rid old include files; with itojun@ and tdeval@; ok itojun@, deraadt@
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/crypto/Makefile | 36 | ||||
| -rw-r--r-- | lib/libssl/ssl/Makefile | 24 |
2 files changed, 25 insertions, 35 deletions
diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile index 038e162e4d2..dead23398f6 100644 --- a/lib/libssl/crypto/Makefile +++ b/lib/libssl/crypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2003/05/12 02:18:34 markus Exp $ +# $OpenBSD: Makefile,v 1.31 2003/06/02 08:45:58 markus Exp $ LIB= crypto @@ -216,29 +216,23 @@ HDRS_GEN=\ ${.OBJDIR}/obj_mac.h includes: obj_mac.h - @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl - @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \ + @test -d ${DESTDIR}/usr/include/openssl || \ + mkdir ${DESTDIR}/usr/include/openssl + @cd ${SSL_SRC}; \ for i in $(HDRS); do \ - f=`basename $$i`; \ - j="sed 's/<openssl/<ssl/' \ - ${SSL_SRC}/$$i >$$d/$$f && \ - (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \ - ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - $$d/$$f ${DESTDIR}/usr/include/ssl)"; \ - echo $$j; \ - eval "$$j"; \ + j="cmp -s $$i ${DESTDIR}/usr/include/openssl/`basename $$i` || \ + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i\ + ${DESTDIR}/usr/include/openssl"; \ + echo $$j; \ + eval "$$j"; \ done; \ for i in $(HDRS_GEN); do \ - f=`basename $$i`; \ - j="sed 's/<openssl/<ssl/' \ - $$i >$$d/$$f && \ - (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \ - ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - $$d/$$f ${DESTDIR}/usr/include/ssl)"; \ - echo $$j; \ - eval "$$j"; \ - done; \ - rm -rf $$d + j="cmp -s $$i ${DESTDIR}/usr/include/openssl/`basename $$i` || \ + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i\ + ${DESTDIR}/usr/include/openssl"; \ + echo $$j; \ + eval "$$j"; \ + done; # generated CFLAGS+= -I${.OBJDIR} diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile index ce04b703c1c..ae911d6fcce 100644 --- a/lib/libssl/ssl/Makefile +++ b/lib/libssl/ssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2002/09/26 11:39:50 markus Exp $ +# $OpenBSD: Makefile,v 1.17 2003/06/02 08:45:58 markus Exp $ LIB= ssl @@ -42,18 +42,14 @@ HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h kssl.h .PATH: ${LSSL_SRC} includes: - @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl - @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \ - cd ${LSSL_SRC}; for i in $(HDRS); do \ - f=`basename $$i`; \ - j="sed 's/<openssl/<ssl/' \ - $$i >$$d/$$f && \ - (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \ - ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - $$d/$$f ${DESTDIR}/usr/include/ssl)"; \ - echo $$j; \ - eval "$$j"; \ - done; \ - rm -rf $$d + @test -d ${DESTDIR}/usr/include/openssl || \ + mkdir ${DESTDIR}/usr/include/openssl + @cd ${LSSL_SRC}; for i in $(HDRS); do \ + j="cmp -s $$i ${DESTDIR}/usr/include/openssl/`basename $$i` || \ + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i\ + ${DESTDIR}/usr/include/openssl"; \ + echo $$j; \ + eval "$$j"; \ + done; .include <bsd.lib.mk> |