From: niklas <niklas@openbsd.org>
Date: Fri, 10 Mar 2000 22:04:18 +0000 (+0000)
Subject: A more normal way of building kerberos, faster, and it works with SUDO
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dc2643168ea26787ca98035371bc2e265d7fe215;p=openbsd

A more normal way of building kerberos, faster, and it works with SUDO
---

diff --git a/Makefile b/Makefile
index ce2648ea0c6..52678bbae37 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.53 2000/03/01 03:56:41 todd Exp $
+#	$OpenBSD: Makefile,v 1.54 2000/03/10 22:05:49 niklas Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -83,6 +83,10 @@ build:
 	    ${SUDO} ${MAKE} install)
 	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
 	    ${SUDO} ${MAKE} install)
+.if (${KERBEROS} == "yes")
+	(cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
+	    ${SUDO} ${MAKE} install)
+.endif
 	(cd ${.CURDIR}/gnu/usr.bin/perl && \
 	    ${MAKE} -f Makefile.bsd-wrapper config.sh && \
 	    ${MAKE} -f Makefile.bsd-wrapper depend && \
@@ -90,12 +94,6 @@ build:
 	    ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib)
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
-.endif
-.if (${KERBEROS} == "yes")
-	(cd ${.CURDIR}/kerberosIV && ${MAKE} SUDO=${SUDO} build)
-.if (${MACHINE_ARCH} == "mips")
-	ldconfig
-.endif
 .endif
 	${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install
 
diff --git a/include/Makefile b/include/Makefile
index 63ad81aecb3..62adb3fbef4 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.80 2000/02/29 03:28:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.81 2000/03/10 22:04:18 niklas Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -59,7 +59,8 @@ NOOBJ=	noobj
 .include <bsd.own.mk>
 SYS_INCLUDE?=	copies
 .if (${KERBEROS} == "yes")
-RDIRS+=	../kerberosIV
+RDIRS+=	../kerberosIV/lib
+PRDIRS+=../kerberosIV/lib/kadm ../kerberosIV/lib/krb
 .endif
 
 prereq:
diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile
index 4e77521ea51..6e9dd32ce83 100644
--- a/kerberosIV/Makefile
+++ b/kerberosIV/Makefile
@@ -1,17 +1,5 @@
-# $OpenBSD: Makefile,v 1.28 2000/02/25 16:35:22 hin Exp $
+# $OpenBSD: Makefile,v 1.29 2000/03/10 22:04:18 niklas Exp $
 
 SUBDIR	= lib usr.bin usr.sbin libexec
 
-build:
-	${MAKE} cleandir
-	${MAKE} includes
-	${MAKE} depend
-	( cd ${.CURDIR}/lib && ${MAKE} && ${MAKE} install )
-	${MAKE}
-	${MAKE} install
-
-prereq:
-	( cd ${.CURDIR}/lib/kadm && ${MAKE} prereq )
-	( cd ${.CURDIR}/lib/krb && ${MAKE} prereq )
-
 .include <bsd.subdir.mk>