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.242
retrieving revision 1.246.2.3
diff -u -p -r1.242 -r1.246.2.3
--- src/Makefile	2006/01/21 19:01:15	1.242
+++ src/Makefile	2007/10/26 14:23:20	1.246.2.3
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.242 2006/01/21 19:01:15 dsl Exp $
+#	$NetBSD: Makefile,v 1.246.2.3 2007/10/26 14:23:20 liamjfoy Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -61,6 +61,14 @@
 #	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
 #   syspkgs:
 #	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'
+#	or equivalent.
+#   iso-image-source:
+#	Create CD-ROM image with source in RELEASEDIR/iso.
+#	RELEASEDIR must already have been populated by
+#	`make release sourcesets' or equivalent.
 #
 # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.
@@ -120,7 +128,7 @@ _SUBDIR+=	usr.sbin share rescue sys etc 
 #
 
 .for dir in ${_SUBDIR}
-.if exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
+.if ("${dir}" == ".WAIT") || exists(${dir}/Makefile) && (${BUILD_${dir}:Uyes} != "no")
 SUBDIR+=	${dir}
 .endif
 .endfor
@@ -150,7 +158,7 @@ _POSTINSTALL=	${.CURDIR}/usr.sbin/postin
 
 postinstall-check: .PHONY
 	@echo "   === Post installation checks ==="
-	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check
+	${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
 	@echo "   ================================"
 
 postinstall-fix: .NOTMAIN .PHONY
@@ -167,10 +175,10 @@ postinstall-fix-obsolete: .NOTMAIN .PHON
 #
 # Targets (in order!) called by "make build".
 #
-.if ${USE_TOOLS_TOOLCHAIN} == "no"
+.if ${HAVE_GCC} == "3"
 LIBGCC_EXT=3
 .else
-LIBGCC_EXT=
+LIBGCC_EXT=4
 .endif
 
 BUILDTARGETS+=	check-tools
@@ -192,7 +200,7 @@ BUILDTARGETS+=	includes
 BUILDTARGETS+=	do-tools-compat
 BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
-.if ${HAVE_GCC3} != "no"
+.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
 BUILDTARGETS+=	do-gnu-lib-crtstuff${LIBGCC_EXT}
 .endif
 BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}
@@ -306,6 +314,22 @@ release snapshot: .PHONY .MAKE
 	@printf "make ${.TARGET} finished at: " && date
 
 #
+# Create a CD-ROM image.
+#
+
+iso-image: .PHONY
+	${MAKEDIRTARGET} distrib iso_image
+	${MAKEDIRTARGET} etc iso-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+iso-image-source: .PHONY
+	${MAKEDIRTARGET} distrib iso_image CDSOURCE=true
+	${MAKEDIRTARGET} etc iso-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
 # Special components of the "make build" process.
 #