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.289
retrieving revision 1.293
diff -u -p -r1.289 -r1.293
--- src/Makefile	2011/09/09 14:23:37	1.289
+++ src/Makefile	2012/08/08 14:00:31	1.293
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.289 2011/09/09 14:23:37 apb Exp $
+#	$NetBSD: Makefile,v 1.293 2012/08/08 14:00:31 christos Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -48,7 +48,7 @@
 #   installworld:
 #	Install the distribution from DESTDIR to INSTALLWORLDDIR (which
 #	defaults to the root directory).  Ensures that INSTALLWORLDDIR
-#	is the not root directory if cross compiling.
+#	is not the root directory if cross compiling.
 #   release:
 #	Does a `make distribution', and then tars up the DESTDIR files
 #	into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format.
@@ -71,6 +71,16 @@
 #	Create CD-ROM image with source in RELEASEDIR/iso.
 #	RELEASEDIR must already have been populated by
 #	`make release sourcesets' or equivalent.
+#   live-image:
+#	Create bootable live image for emulators or USB stick etc.
+#	in RELEASEDIR/liveimage.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
+#   install-image:
+#	Create bootable installation image for USB stick etc.
+#	in RELEASEDIR/installimage.
+#	RELEASEDIR must already have been populated by `make release'
+#	or equivalent.
 #
 # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.
@@ -246,8 +256,10 @@ BUILDTARGETS+=	do-lib
 .if ${MKKMOD} != "no"
 BUILDTARGETS+=	do-sys-modules
 .endif
+.if ${MKRUMP} != "no
 BUILDTARGETS+=	do-sys-rump-dev-lib do-sys-rump-fs-lib
 BUILDTARGETS+=	do-sys-rump-kern-lib do-sys-rump-net-lib
+.endif
 .if ${MKCOMPAT} != "no"
 BUILDTARGETS+=	do-compat-lib-csu
 BUILDTARGETS+=	do-compat-libgcc
@@ -402,6 +414,24 @@ iso-image-source: .PHONY
 	@printf "make ${.TARGET} finished at: " && date
 
 #
+# Create bootable live images.
+#
+
+live-image: .PHONY
+	${MAKEDIRTARGET} etc live-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
+# Create bootable installation images.
+#
+
+install-image: .PHONY
+	${MAKEDIRTARGET} etc install-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
+#
 # Special components of the "make build" process.
 #
 
@@ -535,7 +565,7 @@ do-obsolete: .PHONY .MAKE
 # (Tells <bsd.subdir.mk> not to recurse for them.)
 #
 
-.for dir in bin etc distrib games libexec regress sbin usr.sbin tools
+.for dir in bin etc distrib games libexec regress sbin usr.bin usr.sbin tools
 includes-${dir}: .PHONY
 	@true
 .endfor