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/build.sh,v
rcsdiff: /ftp/cvs/cvsroot/src/build.sh,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.294.2.3
retrieving revision 1.295
diff -u -p -r1.294.2.3 -r1.295
--- src/build.sh	2014/11/14 14:58:27	1.294.2.3
+++ src/build.sh	2014/08/15 18:34:19	1.295
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.294.2.3 2014/11/14 14:58:27 martin Exp $
+#	$NetBSD: build.sh,v 1.295 2014/08/15 18:34:19 apb Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1034,8 +1034,8 @@ Usage: ${progname} [-EhnorUuxy] [-a arch
     sourcesets          Create source sets in RELEASEDIR/source/sets.
     syspkgs             Create syspkgs in
                         RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
-    iso-image           Create CD-ROM image in RELEASEDIR/images.
-    iso-image-source    Create CD-ROM image with source in RELEASEDIR/images.
+    iso-image           Create CD-ROM image in RELEASEDIR/iso.
+    iso-image-source    Create CD-ROM image with source in RELEASEDIR/iso.
     live-image          Create bootable live image in
                         RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
     install-image       Create bootable installation image in
@@ -1314,6 +1314,25 @@ parseoptions()
 			exit $?
 			;;
 
+		makewrapper|cleandir|obj|tools|build|distribution|release|sets|sourcesets|syspkgs|params)
+			;;
+
+		iso-image)
+			op=iso_image	# used as part of a variable name
+			;;
+
+		iso-image-source)
+			op=iso_image_source   # used as part of a variable name
+			;;
+
+		live-image)
+			op=live_image	# used as part of a variable name
+			;;
+
+		install-image)
+			op=install_image # used as part of a variable name
+			;;
+
 		kernel=*|releasekernel=*|kernel.gdb=*)
 			arg=${op#*=}
 			op=${op%%=*}
@@ -1329,6 +1348,10 @@ parseoptions()
 
 			;;
 
+		modules)
+			op=modules
+			;;
+
 		install=*|installmodules=*)
 			arg=${op#*=}
 			op=${op%%=*}
@@ -1336,24 +1359,8 @@ parseoptions()
 			    bomb "Must supply a directory with \`install=...'"
 			;;
 
-		build|\
-		cleandir|\
-		distribution|\
-		install-image|\
-		iso-image-source|\
-		iso-image|\
-		live-image|\
-		makewrapper|\
-		modules|\
-		obj|\
-		params|\
-		release|\
-		rump|\
-		rumptest|\
-		sets|\
-		sourcesets|\
-		syspkgs|\
-		tools)
+		rump|rumptest)
+			op=${op}
 			;;
 
 		*)
@@ -1361,9 +1368,6 @@ parseoptions()
 			;;
 
 		esac
-		# ${op} may contain chars that are not allowed in variable
-		# names.  Replace them with '_' before setting do_${op}.
-		op="$( echo "$op" | tr -s '.-' '__')"
 		eval do_${op}=true
 	done
 	[ -n "${operations}" ] || usage "Missing operation to perform."
@@ -1863,7 +1867,7 @@ createmakewrapper()
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.294.2.3 2014/11/14 14:58:27 martin Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.295 2014/08/15 18:34:19 apb Exp $
 # with these arguments: ${_args}
 #