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.299.2.2
retrieving revision 1.300
diff -u -p -r1.299.2.2 -r1.300
--- src/Makefile	2013/02/25 00:23:49	1.299.2.2
+++ src/Makefile	2012/11/04 11:02:11	1.300
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.299.2.2 2013/02/25 00:23:49 tls Exp $
+#	$NetBSD: Makefile,v 1.300 2012/11/04 11:02:11 apb Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -92,6 +92,8 @@
 #   obj:             creates object directories.
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
+#   do-tools-compat: builds the "libnbcompat" library; needed for some
+#                    random host tool programs in the source tree.
 #   do-lib:          builds and installs prerequisites from lib
 #                    if ${MKCOMPAT} != "no".
 #   do-compat-lib:   builds and installs prerequisites from compat/lib
@@ -259,11 +261,11 @@ includes-gnu:	.PHONY includes-lib
 #
 # This is referenced by _NETBSD_VERSION_DEPENDS in <bsd.own.mk>.
 #
-.include "${NETBSDSRCDIR}/etc/Makefile.params"
+
 CLEANDIRFILES+= params
 params: .EXEC
 	${_MKMSG_CREATE} params
-	@${PRINT_PARAMS} >${.TARGET}.new
+	@(${MAKEDIRTARGET:S/^@//} etc params) >${.TARGET}.new
 	@if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \
 		: "params is unchanged" ; \
 		rm ${.TARGET}.new ; \
@@ -273,12 +275,6 @@ params: .EXEC
 	fi
 
 #
-# Display current make(1) parameters
-#
-show-params: .PHONY .MAKE
-	@${PRINT_PARAMS}
-
-#
 # Build the system and install into DESTDIR.
 #
 
@@ -459,8 +455,12 @@ do-${targ}: .PHONY ${targ}
 	@true
 .endfor
 
-do-tools: .PHONY .MAKE
-	${MAKEDIRTARGET} tools build_install
+.for dir in tools tools/compat
+do-${dir:S/\//-/g}: .PHONY .MAKE
+.for targ in dependall install
+	${MAKEDIRTARGET} ${dir} ${targ}
+.endfor
+.endfor
 
 do-lib: .PHONY .MAKE
 	${MAKEDIRTARGET} lib build_install
@@ -527,3 +527,9 @@ dependall-distrib depend-distrib all-dis
 .include <bsd.obj.mk>
 .include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>
+
+#
+# Display current make(1) parameters
+#
+show-params: .PHONY .MAKE
+	${MAKEDIRTARGET} etc params