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.158
retrieving revision 1.173
diff -u -p -r1.158 -r1.173
--- src/Makefile	2001/11/20 17:05:02	1.158
+++ src/Makefile	2002/05/02 22:13:30	1.173
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.158 2001/11/20 17:05:02 tv Exp $
+#	$NetBSD: Makefile,v 1.173 2002/05/02 22:13:30 sommerfeld 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.
@@ -58,6 +56,12 @@
 .MAKEFLAGS: -m ${.CURDIR}/share/mk
 .endif
 
+# If _SRC_TOP_OBJ_ gets set here, we will end up with a directory that may
+# not be the top level objdir, because "make obj" can happen in the *middle*
+# of "make build" (long after <bsd.own.mk> is calculated it).  So, pre-set
+# _SRC_TOP_OBJ_ here so it will not be added to ${.MAKEOVERRIDES}.
+_SRC_TOP_OBJ_=
+
 .include <bsd.own.mk>
 
 # Sanity check: make sure that "make build" is not invoked simultaneously
@@ -73,12 +77,8 @@
 .endfor
 .endif
 
-.if defined(NBUILDJOBS)
-_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.
 
@@ -94,11 +94,24 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
+afterinstall: postinstall-check
 .if ${MKMAN} != "no"
-afterinstall: whatis.db
-whatis.db:
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
+.if defined(UNPRIVED) && (${MKINFO} != "no")
+	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
+.endif
+
+postinstall-check:
+	@echo "   === Post installation checks ==="
+	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR}/etc -d ${DESTDIR}/etc check
+	@echo "   ================================"
+
+postinstall-fix: .NOTMAIN
+	@echo "   === Post installation fixes ==="
+	sh ${.CURDIR}/etc/postinstall -s ${.CURDIR}/etc -d ${DESTDIR}/etc fix
+	@echo "   ================================"
+
 
 # Targets (in order!) called by "make build".
 
@@ -132,13 +145,19 @@ 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
+	(cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 distribution)
+
 # Build a release or snapshot (implies "make build").
 
 release snapshot: build
@@ -152,6 +171,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} == ""
@@ -163,13 +185,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.
@@ -188,6 +210,9 @@ install-${dir}:
 dependall-distrib depend-distrib all-distrib:
 	@true
 
+clean:
+	rm -f METALOG
+
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>