From 9b45fe862c083325f522a96947d1633c2e209af4 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Sun, 19 Nov 2000 21:22:04 +0000
Subject: Correctly deal with NOMAN being set.  Since it may be set in mk.conf
 we pull in bsd.own.mk before testing for it.

---
 src/lib/libssl/Makefile.bsd-wrapper | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/libssl/Makefile.bsd-wrapper b/src/lib/libssl/Makefile.bsd-wrapper
index 8bc9696c4d..d4426d022c 100644
--- a/src/lib/libssl/Makefile.bsd-wrapper
+++ b/src/lib/libssl/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for OpenSSL
-# $OpenBSD: Makefile.bsd-wrapper,v 1.25 2000/11/10 09:59:02 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.26 2000/11/19 21:22:04 millert Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -37,6 +37,8 @@ SSLCONF=	--openssldir=/etc/ssl OpenBSD
 
 MUNGEDFILES =  	${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/Makefile ${.OBJDIR}/${SSL_SRC}/apps/der_chop ${.OBJDIR}/${SSL_SRC}/tools/c_rehash
 
+.include <bsd.own.mk>		# for NOMAN
+
 .ifndef NOMAN
 MANALL=	ssl.cat3 SSL_get_error.cat3 \
 	\
@@ -450,13 +452,11 @@ MLINKS+=BN_CTX_new.3 BN_CTX_init.3 BN_CTX_new.3 BN_CTX_free.3 \
 	RIPEMD160.3 RIPEMD160_Init.3 RIPEMD160.3 RIPEMD160_Update.3 \
 	RIPEMD160.3 RIPEMD160_Final.3 \
 
-
+.include <bsd.man.mk>
 .else
-MANALL=
-.endif
+maninstall:
 
-.include <bsd.own.mk>
-.include <bsd.man.mk>
+.endif
 
 # XXX .PATH order is critical because of non-unique filenames
 .PATH: ${.CURDIR}/src/doc/crypto ${.CURDIR}/src/doc/ssl ${.CURDIR}/src/doc/apps
-- 
cgit v1.2.3-55-g6feb