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.152
retrieving revision 1.155
diff -u -p -r1.152 -r1.155
--- src/Makefile	2001/11/12 23:16:17	1.152
+++ src/Makefile	2001/11/13 17:47:16	1.155
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.152 2001/11/12 23:16:17 tv Exp $
+#	$NetBSD: Makefile,v 1.155 2001/11/13 17:47:16 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
@@ -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.
@@ -83,7 +83,7 @@ _SUBDIR=	tools lib include gnu bin games
 # Weed out directories that don't exist.
 
 .for dir in ${_SUBDIR}
-.if exists(${dir}/Makefile)
+.if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
 SUBDIR+=	${dir}
 .endif
 .endfor
@@ -102,12 +102,12 @@ whatis.db:
 
 # Targets (in order!) called by "make build".
 
-.if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=	obj
-.endif
 .if !defined(UPDATE) && !defined(NOCLEANDIR)
 BUILDTARGETS+=	cleandir
 .endif
+.if ${MKOBJDIRS} != "no"
+BUILDTARGETS+=	obj
+.endif
 .if ${USETOOLS} == "yes"
 BUILDTARGETS+=	do-tools
 .endif
@@ -133,7 +133,7 @@ build:
 .else
 	@echo -n "Build started at: " && date
 .for tgt in ${BUILDTARGETS}
-	${MAKE} ${_J} ${tgt}
+	(cd ${.CURDIR} && ${MAKE} ${_J} ${tgt})
 .endfor
 	@echo -n "Build finished at: " && date
 .endif
@@ -155,13 +155,14 @@ 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} MKSHARE=no MKLINT=no ${targ})
+	(cd ${.CURDIR}/${dir} && ${MAKE} ${_J} ${targ})
 .endfor
 .endfor
 
 do-build:
-	${MAKE} ${_J} dependall
-	${MAKE} ${_J} install
+.for targ in dependall install
+	(cd ${.CURDIR} && ${MAKE} ${_J} ${targ} BUILD_tools=no BUILD_lib=no)
+.endfor
 
 # Speedup stubs for some subtrees that don't need to run these rules.
 # (Tells <bsd.subdir.mk> not to recurse for them.)