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.246.2.4
retrieving revision 1.247
diff -u -p -r1.246.2.4 -r1.247
--- src/Makefile	2009/06/05 17:19:26	1.246.2.4
+++ src/Makefile	2007/03/06 21:56:47	1.247
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.246.2.4 2009/06/05 17:19:26 snj Exp $
+#	$NetBSD: Makefile,v 1.247 2007/03/06 21:56:47 bouyer Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -62,13 +62,9 @@
 #   syspkgs:
 #	Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}
 #   iso-image:
-#	Create CD-ROM image in RELEASEDIR/iso.
+#	Create CD-ROM image in RELEASEDIR/MACHINE/installation.
 #	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 +116,7 @@ _SRC_TOP_OBJ_=
 .endfor
 .endif
 
-_SUBDIR=	tools lib include gnu external bin games libexec sbin usr.bin
+_SUBDIR=	tools lib include gnu bin games libexec sbin usr.bin
 _SUBDIR+=	usr.sbin share rescue sys etc .WAIT distrib regress
 
 #
@@ -158,7 +154,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
@@ -206,7 +202,7 @@ BUILDTARGETS+=	do-gnu-lib-crtstuff${LIBG
 BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}
 .endif
 BUILDTARGETS+=	do-lib-libc
-BUILDTARGETS+=	do-lib do-gnu-lib do-external-lib
+BUILDTARGETS+=	do-lib do-gnu-lib
 BUILDTARGETS+=	do-ld.so
 BUILDTARGETS+=	do-build
 .if ${MKX11} != "no"
@@ -323,12 +319,6 @@ iso-image: .PHONY
 	@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.
 #
@@ -356,7 +346,7 @@ do-${targ}: .PHONY ${targ}
 	@true
 .endfor
 
-.for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib external/lib
+.for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib
 do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} ${dir} ${targ}