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.164
retrieving revision 1.167
diff -u -p -r1.164 -r1.167
--- src/Makefile	2002/03/01 06:02:41	1.164
+++ src/Makefile	2002/04/11 19:08:13	1.167
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.164 2002/03/01 06:02:41 jmc Exp $
+#	$NetBSD: Makefile,v 1.167 2002/04/11 19:08:13 tv 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
@@ -49,7 +49,6 @@
 #   do-tools:        builds host toolchain.
 #   do-distrib-dirs: creates the distribution directories.
 #   includes:        installs include files.
-#   do-lib-csu:      builds and installs prerequisites from lib/csu.
 #   do-lib:          builds and installs prerequisites from lib.
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
 #   do-build:        builds and installs the entire system.
@@ -88,8 +87,8 @@ _SRC_TOP_OBJ_=
 #_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,20 +104,14 @@ regression-tests:
 	@(cd ${.CURDIR}/regress && ${MAKE} regress)
 .endif
 
-whatis.db:
+afterinstall:
 .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
@@ -137,7 +130,7 @@ BUILDTARGETS+=	do-distrib-dirs
 .if !defined(NOINCLUDES)
 BUILDTARGETS+=	includes
 .endif
-BUILDTARGETS+=	do-lib-csu do-lib do-gnu-lib do-build
+BUILDTARGETS+=	do-lib do-gnu-lib do-build
 
 # Enforce proper ordering of some rules.
 
@@ -185,7 +178,7 @@ do-distrib-dirs:
 	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=${DESTDIR} distrib-dirs)
 .endif
 
-.for dir in tools lib/csu lib gnu/lib
+.for dir in tools lib gnu/lib
 do-${dir:S/\//-/}:
 .for targ in dependall install
 	(cd ${.CURDIR}/${dir} && ${MAKE} ${_J} ${targ})