diff options
| author |   markus <markus@openbsd.org> | 2003-06-02 08:45:58 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2003-06-02 08:45:58 +0000 |
| commit | 0f31054f21065ffbb65aaf86d93ca72cef1da57a (patch) | |
| tree | 6855cd8b1afc67df1931e5116d92853cac02f533 | |
| parent | VerifyHostKeyDNS is v2 only. ok markus@ (diff) | |
| download | wireguard-openbsd-0f31054f21065ffbb65aaf86d93ca72cef1da57a.tar.xz wireguard-openbsd-0f31054f21065ffbb65aaf86d93ca72cef1da57a.zip | |
swap /usr/include/openssl and /usr/include/ssl, clean up the Makefiles
get rid old include files; with itojun@ and tdeval@; ok itojun@, deraadt@
| -rw-r--r-- | include/Makefile | 9 | ||||
| -rw-r--r-- | lib/libssl/crypto/Makefile | 36 | ||||
| -rw-r--r-- | lib/libssl/ssl/Makefile | 24 |
3 files changed, 31 insertions, 38 deletions
diff --git a/include/Makefile b/include/Makefile index 03fa2356c20..f76c6303a54 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.117 2003/05/14 08:01:02 mho Exp $ +# $OpenBSD: Makefile,v 1.118 2003/06/02 08:45:58 markus Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -89,8 +89,11 @@ includes: ${INSTALL} ${INSTALL_COPY} -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \ done; \ done - @rm -f ${DESTDIR}/usr/include/openssl - @ln -sf ssl ${DESTDIR}/usr/include/openssl + @rm -rf ${DESTDIR}/usr/include/openssl ${DESTDIR}/usr/include/ssl \ + ${DESTDIR}/usr/libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ssl \ + ${DESTDIR}/usr/libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/openssl + @mkdir ${DESTDIR}/usr/include/openssl + @ln -sf openssl ${DESTDIR}/usr/include/ssl @echo installing ${LFILES} @for i in ${LFILES}; do \ rm -f ${DESTDIR}/usr/include/$$i && \ 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> |