[src/trunk]: src/etc Undo the mac68k specific previous change and instead mov...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9bd66460a4f8
branches:  trunk
changeset: 330231:9bd66460a4f8
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jun 30 15:34:57 2014 +0000

description:
Undo the mac68k specific previous change and instead move all mkisofs-based
images into ${RELEASEDIR}/images (just like the makefs ones).

diffstat:

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

diffs (62 lines):

diff -r 41d85bb8a0e2 -r 9bd66460a4f8 etc/Makefile
--- a/etc/Makefile      Mon Jun 30 14:58:59 2014 +0000
+++ b/etc/Makefile      Mon Jun 30 15:34:57 2014 +0000
@@ -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 @@
 #      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 @@
 
 .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 @@
 .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 -r 41d85bb8a0e2 -r 9bd66460a4f8 etc/etc.mac68k/Makefile.inc
--- a/etc/etc.mac68k/Makefile.inc       Mon Jun 30 14:58:59 2014 +0000
+++ b/etc/etc.mac68k/Makefile.inc       Mon Jun 30 15:34:57 2014 +0000
@@ -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 @@
 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