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
retrieving revision 1.262.2.3
retrieving revision 1.262.2.4
diff -u -p -r1.262.2.3 -r1.262.2.4
--- src/Makefile	2009/03/27 14:50:35	1.262.2.3
+++ src/Makefile	2011/01/06 05:19:54	1.262.2.4
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.262.2.3 2009/03/27 14:50:35 msaitoh Exp $
+#	$NetBSD: Makefile,v 1.262.2.4 2011/01/06 05:19:54 riz Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -397,19 +397,23 @@ BUILD_CC_LIB+= external/bsd/pcc/crtstuff
 BUILD_CC_LIB+= external/bsd/pcc/libpcc
 .endif
 
-.if ${MKCOMPAT} != "no"
-BUILD_COMPAT_LIBS=	compat/lib/csu ${BUILD_CC_LIB:S/^/compat\//} compat/lib/libc
-.else
-BUILD_COMPAT_LIBS=
-.endif
-
-.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib sys/rump/fs/lib sys/rump/net/lib ${BUILD_COMPAT_LIBS}
+.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib sys/rump/fs/lib sys/rump/net/lib
 do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} ${dir} ${targ}
 .endfor
 .endfor
 
+.if ${MKCOMPAT} != "no"
+COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc
+.for dir in ${COMPAT_SUBDIR_LIST}
+do-compat-${dir:S/\//-/g}: .PHONY .MAKE
+.for targ in obj dependall install
+	${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}"
+.endfor
+.endfor
+.endif
+
 do-top-obj: .PHONY .MAKE
 	${MAKEDIRTARGET} . obj NOSUBDIR=