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.154
retrieving revision 1.160
diff -u -p -r1.154 -r1.160
--- src/Makefile	2001/11/13 15:56:28	1.154
+++ src/Makefile	2001/11/25 18:31:12	1.160
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.154 2001/11/13 15:56:28 tv Exp $
+#	$NetBSD: Makefile,v 1.160 2001/11/25 18:31:12 thorpej 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
@@ -44,8 +44,8 @@
 #	Runs the regression tests in "regress" on this host.
 #
 # Targets invoked by `make build,' in order:
-#   obj:             creates object directories.
 #   cleandir:        cleans the tree.
+#   obj:             creates object directories.
 #   do-tools:        builds host toolchain.
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
@@ -94,20 +94,30 @@ 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
 
+# XXX I wish there was a more rational place to do this, but I can't
+# think of one. There is no one place the info/dir file gets generated.
+infodir-meta:
+.if defined(UNPRIVED) && (${MKINFO} != "no")
+	echo "${DESTDIR}/usr/share/info/dir type=file mode=0644 uname=root gname=wheel" | \
+		sed -e 's|^/|./|g' -e 's|//|/|g' >>${METALOG}
+.endif
+
+afterinstall: whatis.db infodir-meta
+
 # Targets (in order!) called by "make build".
 
-.if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=	obj
-.endif
+BUILDTARGETS+=	check-tools
 .if !defined(UPDATE) && !defined(NOCLEANDIR)
 BUILDTARGETS+=	cleandir
 .endif
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	obj
+.endif
 .if ${USETOOLS} == "yes"
 BUILDTARGETS+=	do-tools
 .endif
@@ -133,11 +143,17 @@ build:
 .else
 	@echo -n "Build started at: " && date
 .for tgt in ${BUILDTARGETS}
-	(cd ${.CURDIR} && ${MAKE} ${_J} ${tgt})
+	@(cd ${.CURDIR} && ${MAKE} ${_J} ${tgt})
 .endfor
 	@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
@@ -145,6 +161,13 @@ release snapshot: build
 
 # Special components of the "make build" process.
 
+check-tools:
+.if defined(USE_NEW_TOOLCHAIN) && (${USE_NEW_TOOLCHAIN} != "nowarn")
+	@echo '*** WARNING:  Building on MACHINE=${MACHINE} with USE_NEW_TOOLCHAIN.'
+	@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
+
 do-distrib-dirs:
 .if !defined(DESTDIR) || ${DESTDIR} == ""
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)