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.165
retrieving revision 1.180
diff -u -p -r1.165 -r1.180
--- src/Makefile	2002/03/05 16:17:06	1.165
+++ src/Makefile	2002/06/26 16:28:18	1.180
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.165 2002/03/05 16:17:06 pk Exp $
+#	$NetBSD: Makefile,v 1.180 2002/06/26 16:28:18 drochner 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
@@ -19,17 +19,15 @@
 #	software. It defaults to /. Note that programs are built against
 #	libraries installed in DESTDIR.
 #   MKMAN, if set to `no', will prevent building of manual pages.
-#   MKOBJDIRS, if not set to `no', will build object directories at 
+#   MKOBJDIRS, if not set to `no', will build object directories at
 #	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.
+#	`make build', as well as having the effects listed in
+#	/usr/share/mk/bsd.README.
 #   NOCLEANDIR, if defined, will avoid a `make cleandir' at the start
-#     of the `make build'.
+#	of the `make build'.
 #   NOINCLUDES will avoid the `make includes' usually done by `make build'.
 #
 # Targets:
@@ -79,17 +77,8 @@ _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 \
-		usr.sbin share sys etc distrib regress
+_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
+_SUBDIR+=	usr.sbin share sys etc distrib regress
 
 # Weed out directories that don't exist.
 
@@ -105,6 +94,10 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
+.if defined(UNPRIVED)
+NOPOSTINSTALL=	# defined
+.endif
+
 afterinstall:
 .if ${MKMAN} != "no"
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
@@ -112,6 +105,20 @@ afterinstall:
 .if defined(UNPRIVED) && (${MKINFO} != "no")
 	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
 .endif
+.if !defined(NOPOSTINSTALL)
+	(cd ${.CURDIR} && ${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".
 
@@ -145,22 +152,24 @@ 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
 # ${RELEASEDIR}).
 
-distribution: build
+distribution:
+	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)
 
 # Build a release or snapshot (implies "make build").
 
-release snapshot: build
+release snapshot:
+	(cd ${.CURDIR} && ${MAKE} NOPOSTINSTALL=1 build)
 	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release)
 
 # Special components of the "make build" process.
@@ -171,6 +180,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} == ""
@@ -182,13 +194,13 @@ do-distrib-dirs:
 .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.
@@ -207,9 +219,6 @@ install-${dir}:
 dependall-distrib depend-distrib all-distrib:
 	@true
 
-clean:
-	rm -f METALOG
-
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>