===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.65
retrieving revision 1.68
diff -u -r1.65 -r1.68
--- src/Makefile	2001/03/28 22:52:22	1.65
+++ src/Makefile	2001/06/26 15:33:28	1.68
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.65 2001/03/28 22:52:22 todd Exp $
+#	$OpenBSD: Makefile,v 1.68 2001/06/26 15:33:28 hin Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -42,6 +42,10 @@
 SUBDIR+= kerberosIV
 .endif
 
+.if (${KERBEROS5:L} == "yes")
+SUBDIR+= kerberosV
+.endif
+
 .if   make(clean) || make(cleandir) || make(obj)
 SUBDIR+= distrib
 .endif
@@ -53,48 +57,48 @@
 
 regression-tests:
 	@echo Running regression tests...
-	@(cd ${.CURDIR}/regress && ${MAKE} regress)
+	@cd ${.CURDIR}/regress && exec ${MAKE} regress
 .endif
 
 includes:
-	(cd ${.CURDIR}/include; ${MAKE} prereq; ${MAKE} includes)
+	cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes
 
 beforeinstall:
-.ifndef DESTDIR
-	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR= distrib-dirs)
-.else
-	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
-.endif
-	(cd ${.CURDIR}/include; ${MAKE} includes)
+	cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} distrib-dirs
+	cd ${.CURDIR}/include && exec ${MAKE} includes
 
 afterinstall:
 .ifndef NOMAN
-	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
+	cd ${.CURDIR}/share/man && exec ${MAKE} makedb
 .endif
 
 build:
 .ifdef GLOBAL_AUTOCONF_CACHE
 	cp /dev/null ${GLOBAL_AUTOCONF_CACHE}
 .endif
-	(cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/include; ${MAKE} prereq; ${SUDO} ${MAKE} includes)
+	cd ${.CURDIR}/share/mk && exec ${SUDO} ${MAKE} install
+	cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes
 	${SUDO} ${MAKE} cleandir
-	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
-	    NOMAN=1 ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
-	    NOMAN=1 ${SUDO} ${MAKE} install)
+	cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
+	    NOMAN=1 exec ${SUDO} ${MAKE} install
+	cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
+	    NOMAN=1 exec ${SUDO} ${MAKE} install
 .if (${KERBEROS:L} == "yes")
-	(cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
-	    NOMAN=1 ${SUDO} ${MAKE} install)
+	cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
+	    NOMAN=1 exec ${SUDO} ${MAKE} install
 .endif
-	(cd ${.CURDIR}/gnu/usr.bin/perl && \
+.if (${KERBEROS5:L} == "yes")
+	cd ${.CURDIR}/kerberosV/lib && ${MAKE} depend && ${MAKE} && \
+	    NOMAN=1 exec ${SUDO} ${MAKE} install
+.endif
+	cd ${.CURDIR}/gnu/usr.bin/perl && \
 	    ${MAKE} -f Makefile.bsd-wrapper depend && \
 	    ${MAKE} -f Makefile.bsd-wrapper perl.lib && \
-	    ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib)
+	    exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig -R
 .endif
-	${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install
+	${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
 
 .if !defined(TARGET)
 cross-tools:
@@ -136,6 +140,7 @@
 	@-mkdir -p ${CROSSDIR}/usr/bin
 	@-mkdir -p ${CROSSDIR}/usr/include
 	@-mkdir -p ${CROSSDIR}/usr/include/kerberosIV
+	@-mkdir -p ${CROSSDIR}/usr/include/kerberosV
 	@-mkdir -p ${CROSSDIR}/usr/lib
 	@-mkdir -p ${CROSSDIR}/usr/libexec
 	@-mkdir -p ${CROSSDIR}/var/db
@@ -324,6 +329,18 @@
 	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
 	export MACHINE MACHINE_ARCH; \
 	cd kerberosIV/lib; \
+	BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
+	${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN= depend; \
+	${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
+	${CROSSENV} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN= install
+.endif
+.if (${KERBEROS5:L} == "yes")
+	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
+	export MACHINE MACHINE_ARCH; \
+	cd kerberosV/lib; \
 	BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
 	${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \