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.280
retrieving revision 1.286
diff -u -p -r1.280 -r1.286
--- src/Makefile	2010/11/28 18:40:54	1.280
+++ src/Makefile	2011/06/29 02:05:24	1.286
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.280 2010/11/28 18:40:54 skrll Exp $
+#	$NetBSD: Makefile,v 1.286 2011/06/29 02:05:24 mrg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -91,8 +91,6 @@
 #                    external/bsd/pcc/libpcc.
 #   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.
-#   do-external-lib: builds and installs prerequisites from external/lib.
 #   do-sys-rump-dev-lib: builds and installs prerequisites from sys/rump/dev/lib
 #   do-sys-rump-fs-lib:  builds and installs prerequisites from sys/rump/fs/lib
 #   do-sys-rump-kern-lib:  builds and installs prereq. from sys/rump/kern/lib
@@ -201,10 +199,14 @@ postinstall-fix-obsolete: .NOTMAIN .PHON
 # Targets (in order!) called by "make build".
 #
 .if defined(HAVE_GCC)
-.if ${HAVE_GCC} == "3"
-LIBGCC_EXT=3
-.else
+.if ${HAVE_GCC} == "4"
 LIBGCC_EXT=4
+BUILD_CC_LIB_BASEDIR= gnu/lib
+BUILD_CC_LIB_BASETARGET= gnu-lib
+.else
+LIBGCC_EXT=
+BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
+BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif
 .endif
 
@@ -240,8 +242,8 @@ BUILDTARGETS+=	do-libgcc
 BUILDTARGET+=	do-libpcc
 .endif
 BUILDTARGETS+=	do-lib-libc
-BUILDTARGETS+=	do-lib do-gnu-lib do-external-lib
-.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
+BUILDTARGETS+=	do-lib
+.if ${MKKMOD} != "no"
 BUILDTARGETS+=	do-sys-modules
 .endif
 BUILDTARGETS+=	do-sys-rump-dev-lib do-sys-rump-fs-lib
@@ -334,7 +336,7 @@ installworld: .PHONY .MAKE
 .endif
 .endif
 	${MAKEDIRTARGET} distrib/sets installsets \
-	    INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=
+		INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=${INSTALLSETS:Q}
 	${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
@@ -411,15 +413,15 @@ do-${targ}: .PHONY ${targ}
 
 .if defined(HAVE_GCC)
 .if ${USE_COMPILERCRTSTUFF} == "yes"
-BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT}
+BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT}
 .endif
-BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT}
+BUILD_CC_LIB+= ${BUILD_CC_LIB_BASEDIR}/libgcc${LIBGCC_EXT}
 .elif defined(HAVE_PCC)
 BUILD_CC_LIB+= external/bsd/pcc/crtstuff
 BUILD_CC_LIB+= external/bsd/pcc/libpcc
 .endif
 
-.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib gnu/lib external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules
+.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules
 do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} ${dir} ${targ}
@@ -430,7 +432,7 @@ do-${dir:S/\//-/g}: .PHONY .MAKE
 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
+.for targ in dependall install
 	${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}"
 .endfor
 .endfor
@@ -446,11 +448,9 @@ do-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"
 .if ${USE_COMPILERCRTSTUFF} == "yes"
-.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
-	${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
-.endif
+	${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
 .endif
-	${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT}
+	${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif
 .endif
 
@@ -458,9 +458,9 @@ do-compat-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"
 .if ${USE_COMPILERCRTSTUFF} == "yes"
-	${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}
+	${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT}
 .endif
-	${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}
+	${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT}
 .endif
 .endif