From 59ac30731bc3b843a62a464a198fc4237d1a1a1c Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Mon, 30 Jun 2014 15:34:57 +0000
Subject: [PATCH] Undo the mac68k specific previous change and instead move all
 mkisofs-based images into ${RELEASEDIR}/images (just like the makefs ones).

---
 etc/Makefile                | 12 +++++++-----
 etc/etc.mac68k/Makefile.inc |  7 ++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index c77820c6dd48..4d3bae242efc 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.414 2014/06/14 12:26:26 apb Exp $
+#	$NetBSD: Makefile,v 1.415 2014/06/30 15:34:57 martin Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -405,7 +405,7 @@ release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR snap_md_post
 #	Note: At least mkisofs 2.0 should be used.
 #
 CDROM_NAME_ADD?=
-CDROM_IMAGE?=${RELEASEDIR}/iso/NetBSD-${DISTRIBVER}-${MACHINE}.iso
+CDROM_IMAGE?=${RELEASEDIR}/images/NetBSD-${DISTRIBVER}-${MACHINE}.iso
 CDROM.dir=	${.OBJDIR}/cdrom.dir
 CDROM.pathlist=	${.OBJDIR}/cdrom.pathlist
 
@@ -413,7 +413,7 @@ iso-image:
 
 .if ${MKISOFS} != true
 do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
-	${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso'
+	${MAKESUMS} -t ${RELEASEDIR}/images/ '*.iso'
 	@echo "iso-image created as: ${CDROM_IMAGE}"
 .else
 do-iso-image:
@@ -429,12 +429,14 @@ iso-image-setup: .PHONY check_RELEASEDIR
 .endfor
 	echo "${MACHINE}/=${RELEASEDIR}/${RELEASEMACHINEDIR}/" >> ${CDROM.pathlist}
 	mkdir -p ${CDROM.dir}
-	mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom
+
+check_imagedir:
+	mkdir -p ${RELEASEDIR}/images
 
 # iso-image-mi --
 #	Create the image after the MD operations have completed.
 #
-iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre
+iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre check_imagedir
 	@if ! ${MKISOFS} --version; then \
 		echo "install pkgsrc/sysutils/cdrtools and run 'make iso-image'." ; \
 		false; \
diff --git a/etc/etc.mac68k/Makefile.inc b/etc/etc.mac68k/Makefile.inc
index 81511d7bc6a1..58c3ab00fe4b 100644
--- a/etc/etc.mac68k/Makefile.inc
+++ b/etc/etc.mac68k/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.21 2014/06/29 17:49:04 martin Exp $
+#	$NetBSD: Makefile.inc,v 1.22 2014/06/30 15:34:57 martin Exp $
 #
 #	etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
 #
@@ -21,7 +21,4 @@ snap_md_post:
 MKISOFS_FLAGS+=	-hfs --macbin \
 	-map ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/extensions.map
 
-check-iso-dir:
-	-mkdir -p ${RELEASEDIR}/iso
-
-iso-image: check-iso-dir .WAIT do-iso-image
+iso-image: do-iso-image