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.157
retrieving revision 1.164
diff -u -p -r1.157 -r1.164
--- src/Makefile	2001/11/20 15:20:28	1.157
+++ src/Makefile	2002/03/01 06:02:41	1.164
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.157 2001/11/20 15:20:28 thorpej Exp $
+#	$NetBSD: Makefile,v 1.164 2002/03/01 06:02:41 jmc 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
@@ -58,6 +58,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
@@ -74,20 +80,16 @@
 .endif
 
 .if defined(NBUILDJOBS)
-_J=		-j${NBUILDJOBS}
+.if !target(.BEGIN)
+.BEGIN:
+	@echo 'NBUILDJOBS is currently broken; see PR toolchain/14837.'
+	@false
 .endif
-
-# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW.  Also note that
-# distrib does not belong here, either, as it is a very special case.
-_SUBDIR+=	tools lib include gnu bin games libexec sbin usr.bin \
-		usr.sbin share sys regress
-
-.if make(cleandir) || make(clean) || make(obj)
-_SUBDIR+= distrib
-.ifdef MAKEOBJDIRPREFIX
-_SUBDIR+= etc
+#_J=		-j${NBUILDJOBS}
 .endif
-.endif  
+
+_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin \
+		usr.sbin share sys etc distrib regress
 
 # Weed out directories that don't exist.
 
@@ -103,12 +105,20 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-.if ${MKMAN} != "no"
-afterinstall: whatis.db
 whatis.db:
+.if ${MKMAN} != "no"
 	(cd ${.CURDIR}/share/man && ${MAKE} makedb)
 .endif
 
+# Let install-info track this as it's the program creating/updating the
+# dir file
+infodir-meta:
+.if defined(UNPRIVED) && (${MKINFO} != "no")
+	(cd ${.CURDIR}/gnu/usr.bin/texinfo/install-info && ${MAKE} infodir-meta)
+.endif
+
+afterinstall: whatis.db infodir-meta
+
 # Targets (in order!) called by "make build".
 
 BUILDTARGETS+=	check-tools
@@ -148,6 +158,12 @@ build:
 	@echo -n "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
@@ -197,6 +213,9 @@ install-${dir}:
 dependall-distrib depend-distrib all-distrib:
 	@true
 
+clean:
+	rm -f METALOG
+
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>