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.284
retrieving revision 1.288
diff -u -p -r1.284 -r1.288
--- src/Makefile	2011/06/20 06:52:36	1.284
+++ src/Makefile	2011/08/08 23:18:36	1.288
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.284 2011/06/20 06:52:36 mrg Exp $
+#	$NetBSD: Makefile,v 1.288 2011/08/08 23:18:36 jmcneill Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -201,8 +201,12 @@ postinstall-fix-obsolete: .NOTMAIN .PHON
 .if defined(HAVE_GCC)
 .if ${HAVE_GCC} == "4"
 LIBGCC_EXT=4
+BUILD_CC_LIB_BASEDIR= gnu/lib
+BUILD_CC_LIB_BASETARGET= gnu-lib
 .else
-LIBGCC_EXT=45
+LIBGCC_EXT=
+BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
+BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif
 .endif
 
@@ -338,6 +342,29 @@ installworld: .PHONY .MAKE
 	@printf "make ${.TARGET} finished at: " && date
 
 #
+# Install modules from $DESTDIR to $INSTALLMODULESDIR
+#
+installmodules: .PHONY .MAKE
+.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
+	@echo "Can't make ${.TARGET} to DESTDIR=/"
+	@false
+.endif
+.if !defined(INSTALLMODULESDIR) || \
+    ${INSTALLMODULESDIR} == "" || ${INSTALLMODULESDIR} == "/"
+.if (${HOST_UNAME_S} != "NetBSD")
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLMODULESDIR=/"
+	@false
+.endif
+.if (${HOST_UNAME_M} != ${MACHINE})
+	@echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLMODULESDIR=/"
+	@false
+.endif
+.endif
+	${MAKEDIRTARGET} sys/modules install DESTDIR=${INSTALLMODULESDIR:U/}
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
 # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR
 #
 
@@ -409,9 +436,9 @@ 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
@@ -444,9 +471,9 @@ do-libgcc: .PHONY .MAKE
 .if defined(HAVE_GCC)
 .if ${MKGCC} != "no"
 .if ${USE_COMPILERCRTSTUFF} == "yes"
-	${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT}
+	${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
 
@@ -454,9 +481,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