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.247.4.3
retrieving revision 1.248
diff -u -p -r1.247.4.3 -r1.248
--- src/Makefile	2008/03/23 00:12:06	1.247.4.3
+++ src/Makefile	2007/08/30 05:30:02	1.248
@@ -1,4 +1,4 @@
-#	Makefile,v 1.247.4.2 2008/01/09 01:19:18 matt Exp
+#	$NetBSD: Makefile,v 1.248 2007/08/30 05:30:02 jnemeth Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -51,18 +51,16 @@
 #	is the not root directory if cross compiling.
 #   release:
 #	Does a `make distribution', and then tars up the DESTDIR files
-#	into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.
+#	into RELEASEDIR/${MACHINE}, in release(7) format.
 #	(See etc/Makefile for more information on this.)
 #   regression-tests:
 #	Runs the regression tests in "regress" on this host.
 #   sets:
-#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
-#	from ${DESTDIR}
+#	Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR}
 #   sourcesets:
 #	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
 #   syspkgs:
-#	Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
-#	from ${DESTDIR}
+#	Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}
 #   iso-image:
 #	Create CD-ROM image in RELEASEDIR/iso.
 #	RELEASEDIR must already have been populated by `make release'
@@ -81,9 +79,9 @@
 #   do-tools-compat: builds the "libnbcompat" library; needed for some
 #                    random host tool programs in the source tree.
 #   do-lib-csu:      builds and installs prerequisites from lib/csu.
-#   do-libgcc:       builds and installs prerequisites from
-#                    gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
-#                    gnu/lib/libgcc${LIBGCC_EXT}.
+#   do-gnu-lib-crtstuff3: builds and installs prerequisites from
+#			  gnu/lib/crtstuff3
+#   do-gnu-lib-libgcc3: builds and installs prerequisites from gnu/lib/libgcc3
 #   do-lib-libc:     builds and installs prerequisites from lib/libc.
 #   do-lib:          builds and installs prerequisites from lib.
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
@@ -123,7 +121,7 @@ _SRC_TOP_OBJ_=
 .endif
 
 _SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
-_SUBDIR+=	usr.sbin share rescue sys etc tests .WAIT distrib regress
+_SUBDIR+=	usr.sbin share rescue sys etc .WAIT distrib regress
 
 #
 # Weed out directories that don't exist.
@@ -160,7 +158,7 @@ _POSTINSTALL=	${.CURDIR}/usr.sbin/postin
 
 postinstall-check: .PHONY
 	@echo "   === Post installation checks ==="
-	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
+	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check
 	@echo "   ================================"
 
 postinstall-fix: .NOTMAIN .PHONY
@@ -202,7 +200,10 @@ BUILDTARGETS+=	includes
 BUILDTARGETS+=	do-tools-compat
 BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
-BUILDTARGETS+=	do-libgcc
+.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
+BUILDTARGETS+=	do-gnu-lib-crtstuff${LIBGCC_EXT}
+.endif
+BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}
 .endif
 BUILDTARGETS+=	do-lib-libc
 BUILDTARGETS+=	do-lib do-gnu-lib
@@ -362,14 +363,6 @@ do-${dir:S/\//-/g}: .PHONY .MAKE
 .endfor
 .endfor
 
-do-libgcc: .PHONY .MAKE
-.if ${MKGCC} != "no"
-.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
-	${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
-.endif
-	${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
-.endif
-
 do-ld.so: .PHONY .MAKE
 .for targ in dependall install
 .if (${OBJECT_FMT} == "a.out")