From a7aaf459e796af98bc28946ebbdaae11fa7cb4b2 Mon Sep 17 00:00:00 2001
From: Kris Kennaway <kris@FreeBSD.org>
Date: Thu, 13 Apr 2000 07:37:26 +0000
Subject: [PATCH] Update for OpenSSL 0.9.5a and clean up a bit. Take
 responsibility for this makefile again :-)

---
 secure/lib/librsaintl/Makefile | 24 +++++-------------------
 secure/lib/librsausa/Makefile  | 24 +++++-------------------
 2 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/secure/lib/librsaintl/Makefile b/secure/lib/librsaintl/Makefile
index 8f73471e5b12..d5b2a37bd338 100644
--- a/secure/lib/librsaintl/Makefile
+++ b/secure/lib/librsaintl/Makefile
@@ -2,7 +2,8 @@
 
 .include "../libcrypto/Makefile.inc"
 
-# Don't blame kris.. -peter
+.PATH:	${LCRYPTO_SRC}/rsa
+
 MAINTAINER=	kris
 
 LIB=		rsaINTL
@@ -24,23 +25,8 @@ HDRS=	asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
 	stack/safestack.h sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h \
 	x509/x509.h x509/x509_vfy.h x509v3/x509v3.h
 
-beforedepend: headers ${.OBJDIR}/openssl/opensslconf.h 
-
-DPADD+=	${.OBJDIR}/openssl/opensslconf.h
-
-CLEANDIRS+=	${.OBJDIR}/openssl
-
-${.OBJDIR}/openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
-	@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
-	cp ${.OODATE} ${.TARGET}
-
-headers:
-	@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
-	for i in ${HDRS}; do \
-		${INSTALL} ${COPY} -m 444 ${LCRYPTO_SRC}/$$i \
-			${.OBJDIR}/openssl; \
-	done
-
-.PATH:	${LCRYPTO_SRC}/rsa
+.for h in ${HDRS}
+CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h}
+.endfor
 
 .include <bsd.lib.mk>
diff --git a/secure/lib/librsausa/Makefile b/secure/lib/librsausa/Makefile
index 6196af920f6a..70dbcb785a8d 100644
--- a/secure/lib/librsausa/Makefile
+++ b/secure/lib/librsausa/Makefile
@@ -2,7 +2,8 @@
 
 .include "../libcrypto/Makefile.inc"
 
-# Don't blame kris.. -peter
+.PATH:	${LCRYPTO_SRC}/../rsaref
+
 MAINTAINER=	kris
 
 LIB=		rsaUSA
@@ -25,23 +26,8 @@ HDRS=	asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
 	stack/safestack.h sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h \
 	x509/x509.h x509/x509_vfy.h x509v3/x509v3.h
 
-beforedepend: headers ${.OBJDIR}/openssl/opensslconf.h 
-
-DPADD+=	${.OBJDIR}/openssl/opensslconf.h
-
-CLEANDIRS+=	${.OBJDIR}/openssl
-
-${.OBJDIR}/openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
-	@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
-	cp ${.OODATE} ${.TARGET}
-
-headers:
-	@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
-	for i in ${HDRS}; do \
-		${INSTALL} ${COPY} -m 444 ${LCRYPTO_SRC}/$$i \
-			${.OBJDIR}/openssl; \
-	done
-
-.PATH:	${LCRYPTO_SRC}/../rsaref
+.for h in ${HDRS}
+CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h}
+.endfor
 
 .include <bsd.lib.mk>