===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.39
retrieving revision 1.46
diff -u -r1.39 -r1.46
--- src/Makefile	1998/08/28 22:46:02	1.39
+++ src/Makefile	1999/01/24 16:40:42	1.46
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.39 1998/08/28 22:46:02 mickey Exp $
+#	$OpenBSD: Makefile,v 1.46 1999/01/24 16:40:42 niklas Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -17,10 +17,14 @@
 # well as populate the /usr/obj properly with directories for the
 # objects.
 #
-# 3) If you are reasonably sure that things will compile OK, use the
+# 3) It is strongly recommended that you build and install a new kernel
+# before rebuilding your system. Some of the new programs may use new
+# functionality or depend on API changes that your old kernel doesn't have.
+#
+# 4) If you are reasonably sure that things will compile OK, use the
 # "make build" target supplied here. Good luck.
 #
-# 4) If you want to setup a cross-build environment, there is a "cross-tools"
+# 5) If you want to setup a cross-build environment, there is a "cross-tools"
 # target available which upon completion of "make TARGET=<target> cross-tools" 
 # (where <target> is one of the names in the /sys/arch directory) will produce
 # a set of compilation tools along with the includes in the /usr/cross/<target>
@@ -57,7 +61,7 @@
 
 beforeinstall:
 .ifndef DESTDIR
-	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
+	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR= distrib-dirs)
 .else
 	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
 .endif
@@ -72,21 +76,23 @@
 .ifdef GLOBAL_AUTOCONF_CACHE
 	rm -f ${GLOBAL_AUTOCONF_CACHE}
 .endif
-	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	(cd ${.CURDIR}/include; ${MAKE} includes)
-	${MAKE} cleandir
-	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
-	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
+	(cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)
+	(cd ${.CURDIR}/include; ${SUDO} ${MAKE} includes)
+	${SUDO} ${MAKE} cleandir
+	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
+	    ${SUDO} ${MAKE} install)
+	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
+	    ${SUDO} ${MAKE} install)
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
 .endif
 .if (${KERBEROS} == "yes")
-	(cd ${.CURDIR}/kerberosIV && ${MAKE} build)
+	(cd ${.CURDIR}/kerberosIV && ${MAKE} SUDO=${SUDO} build)
 .endif
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
 .endif
-	${MAKE} depend && ${MAKE} && ${MAKE} install
+	${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install
 
 .if !defined(TARGET)
 cross-tools:
@@ -296,6 +302,7 @@
 	chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
 	chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp
 
+# XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
 cross-lib:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/lib
@@ -309,14 +316,31 @@
 	    for lib in csu libc; do \
 		(cd $$lib; \
 		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		    ${MAKE} NOMAN= depend; \
+		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		    ${MAKE} NOMAN=; \
 		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		    DESTDIR=${CROSSDIR} ${MAKE} NOMAN= install); \
 	    done; \
+	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN= depend; \
 	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
 	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \
 	    ${MAKE} NOMAN= install)
+	(cd kerberosIV; \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} obj; \
+	    for lib in acl krb kadm kafs kdb; do \
+		(cd $$lib; \
+		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		    ${MAKE} NOMAN= depend; \
+		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		    ${MAKE} NOMAN=; \
+		    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		    ${MAKE} NOMAN= install); \
+	    done)
 	ln -sf ${CROSSDIR}/usr/lib \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib