Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.167
retrieving revision 1.176
diff -u -p -r1.167 -r1.176
--- src/Makefile	2002/04/11 19:08:13	1.167
+++ src/Makefile	2002/06/19 00:17:11	1.176
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.167 2002/04/11 19:08:13 tv Exp $
+#	$NetBSD: Makefile,v 1.176 2002/06/19 00:17:11 lukem Exp $
 
 # This is the top-level makefile for building NetBSD. For an outline of
 # how to build a snapshot or release, as well as other release engineering
@@ -23,8 +23,6 @@
 #	an appropriate point in a build.
 #   MKSHARE, if set to `no', will prevent building and installing
 #	anything in /usr/share.
-#   NBUILDJOBS is the number of jobs to start in parallel during a
-#	`make build'. It defaults to 1.
 #   UPDATE, if defined, will avoid a `make cleandir' at the start of
 #     `make build', as well as having the effects listed in
 #     /usr/share/mk/bsd.README.
@@ -49,6 +47,7 @@
 #   do-tools:        builds host toolchain.
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
+#   do-lib-csu:      builds and installs prerequisites from lib/csu.
 #   do-lib:          builds and installs prerequisites from lib.
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
 #   do-build:        builds and installs the entire system.
@@ -78,15 +77,6 @@ _SRC_TOP_OBJ_=
 .endfor
 .endif
 
-.if defined(NBUILDJOBS)
-.if !target(.BEGIN)
-.BEGIN:
-	@echo 'NBUILDJOBS is currently broken; see PR toolchain/14837.'
-	@false
-.endif
-#_J=		-j${NBUILDJOBS}
-.endif
-
 _SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
 _SUBDIR+=	usr.sbin share sys etc distrib regress
 
@@ -111,6 +101,20 @@ afterinstall:
 .if defined(UNPRIVED) && (${MKINFO} != "no")
 	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
 .endif
+.if !defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/"
+	(${MAKE} postinstall-check)
+.endif
+
+postinstall-check:
+	@echo "   === Post installation checks ==="
+	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ check
+	@echo "   ================================"
+
+postinstall-fix: .NOTMAIN
+	@echo "   === Post installation fixes ==="
+	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR} -d ${DESTDIR}/ fix
+	@echo "   ================================"
+
 
 # Targets (in order!) called by "make build".
 
@@ -130,7 +134,7 @@ BUILDTARGETS+=	do-distrib-dirs
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
-BUILDTARGETS+=	do-lib do-gnu-lib do-build
+BUILDTARGETS+=	do-lib-csu do-lib do-gnu-lib do-build
 
 # Enforce proper ordering of some rules.
 
@@ -144,11 +148,11 @@ build:
 .if defined(BUILD_DONE)
 	@echo "Build already installed into ${DESTDIR}"
 .else
-	@echo -n "Build started at: " && date
+	@printf "Build started at: " && date
 .for tgt in ${BUILDTARGETS}
-	@(cd ${.CURDIR} && ${MAKE} ${_J} ${tgt})
+	@(cd ${.CURDIR} && ${MAKE} ${tgt})
 .endfor
-	@echo -n "Build finished at: " && date
+	@printf "Build finished at: " && date
 .endif
 
 # Build a full distribution, but not a release (i.e. no sets into
@@ -170,6 +174,9 @@ check-tools:
 	@echo '*** This platform is not yet verified to work with the new toolchain,'
 	@echo '*** and may result in a failed build or corrupt binaries!'
 .endif
+.if defined(NBUILDJOBS)
+	@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
+.endif
 
 do-distrib-dirs:
 .if !defined(DESTDIR) || ${DESTDIR} == ""
@@ -178,16 +185,16 @@ do-distrib-dirs:
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs)
 .endif
 
-.for dir in tools lib gnu/lib
+.for dir in tools lib/csu lib gnu/lib
 do-${dir:S/\//-/}:
 .for targ in dependall install
-	(cd ${.CURDIR}/${dir} && ${MAKE} ${_J} ${targ})
+	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})
 .endfor
 .endfor
 
 do-build:
 .for targ in dependall install
-	(cd ${.CURDIR} && ${MAKE} ${_J} ${targ} BUILD_tools=no BUILD_lib=no)
+	(cd ${.CURDIR} && ${MAKE} ${targ} BUILD_tools=no BUILD_lib=no)
 .endfor
 
 # Speedup stubs for some subtrees that don't need to run these rules.
@@ -206,9 +213,6 @@ install-${dir}:
 dependall-distrib depend-distrib all-distrib:
 	@true
 
-clean:
-	rm -f METALOG
-
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>