From c3f5284e46d81047291e19af7facac131b491c30 Mon Sep 17 00:00:00 2001
From: markus <>
Date: Mon, 2 Jun 2003 08:45:58 +0000
Subject: swap /usr/include/openssl and /usr/include/ssl, clean up the
Makefiles get rid old include files; with itojun@ and tdeval@; ok itojun@,
deraadt@
---
src/lib/libssl/crypto/Makefile | 36 +++++++++++++++---------------------
src/lib/libssl/ssl/Makefile | 24 ++++++++++--------------
2 files changed, 25 insertions(+), 35 deletions(-)
(limited to 'src/lib')
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index 038e162e4d..dead23398f 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/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/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index ce04b703c1..ae911d6fcc 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/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>
--
cgit v1.2.3-55-g6feb