Module Name: src
Committed By: christos
Date: Mon Sep 23 13:42:37 UTC 2019
Modified Files:
src/distrib/acorn32/cdroms/installcd: Makefile
src/distrib/alpha/cdroms/installcd: Makefile
src/distrib/amd64/cdroms/installcd: Makefile
src/distrib/amiga/cdroms/installcd: Makefile
src/distrib/arc/cdroms/installcd: Makefile
src/distrib/atari/cdroms/installcd: Makefile
src/distrib/cats/cdroms/installcd: Makefile
src/distrib/cobalt/cdroms/installcd: Makefile
src/distrib/common: Makefile.bootcd
src/distrib/dreamcast/cdroms/installcd: Makefile
src/distrib/emips/cdroms/installcd: Makefile
src/distrib/evbarm/cdroms/installcd: Makefile
src/distrib/evbmips/cdroms/installcd: Makefile
src/distrib/evbppc/cdroms/installcd: Makefile
src/distrib/evbsh3/cdroms/installcd: Makefile
src/distrib/ews4800mips/cdroms/installcd: Makefile
src/distrib/hp300/cdroms/installcd: Makefile
src/distrib/hpcarm/cdroms/installcd: Makefile
src/distrib/hpcmips/cdroms/installcd: Makefile
src/distrib/hpcsh/cdroms/installcd: Makefile
src/distrib/hppa/cdroms/installcd: Makefile
src/distrib/i386/cdroms/installcd: Makefile
src/distrib/ia64/cdroms/installcd: Makefile
src/distrib/ibmnws/cdroms/installcd: Makefile
src/distrib/luna68k/cdroms/installcd: Makefile
src/distrib/macppc/cdroms/installcd: Makefile
src/distrib/mipsco/cdroms/installcd: Makefile
src/distrib/mvme68k/cdroms/installcd: Makefile
src/distrib/mvmeppc/cdroms/installcd: Makefile
src/distrib/news68k/cdroms/installcd: Makefile
src/distrib/newsmips/cdroms/installcd: Makefile
src/distrib/ofppc/cdroms/installcd: Makefile
src/distrib/playstation2/cdroms/installcd: Makefile
src/distrib/pmax/cdroms/installcd: Makefile
src/distrib/prep/cdroms/installcd: Makefile
src/distrib/sandpoint/cdroms/installcd: Makefile
src/distrib/sgimips/cdroms/installcd: Makefile
src/distrib/shark/cdroms/installcd: Makefile
src/distrib/sparc/cdroms/installcd: Makefile
src/distrib/sparc64/cdroms/installcd: Makefile
src/distrib/sun2/cdroms/installcd: Makefile
src/distrib/sun3/cdroms/installcd: Makefile
src/distrib/vax/cdroms/installcd: Makefile
src/distrib/x68k/cdroms/installcd: Makefile
src/distrib/zaurus/cdroms/installcd: Makefile
src/sys/arch/alpha/stand/netboot: Makefile
src/sys/arch/hp300/stand/inst: Makefile
src/sys/arch/hp300/stand/uboot: Makefile
src/sys/arch/i386/stand/dosboot: Makefile
src/sys/arch/i386/stand/misc: Makefile
src/sys/arch/i386/stand/pxeboot: Makefile
src/sys/arch/x68k/stand/loadbsd: Makefile
src/sys/arch/zaurus/stand/zboot: Makefile
src/sys/arch/zaurus/stand/zbsdmod: Makefile
src/sys/stand/efiboot/bootaa64: Makefile
src/sys/stand/efiboot/bootarm: Makefile
Log Message:
Consistently use ${RELEASEDIR}/${RELEASEMACHINE} instead of
${RELEASEDIR}/${MACHINE} (Paul Ripke)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/acorn32/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/alpha/cdroms/installcd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/distrib/amd64/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amiga/cdroms/installcd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/arc/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/atari/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/cats/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/cobalt/cdroms/installcd/Makefile
cvs rdiff -u -r1.41 -r1.42 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.2 -r1.3 src/distrib/dreamcast/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/emips/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbarm/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/evbmips/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/evbppc/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/evbsh3/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/ews4800mips/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/hp300/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/hpcarm/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/hpcmips/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/hpcsh/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/hppa/cdroms/installcd/Makefile
cvs rdiff -u -r1.9 -r1.10 src/distrib/i386/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/ia64/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/ibmnws/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/luna68k/cdroms/installcd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/macppc/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/mipsco/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/mvme68k/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/mvmeppc/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/news68k/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/newsmips/cdroms/installcd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/distrib/ofppc/cdroms/installcd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/playstation2/cdroms/installcd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/pmax/cdroms/installcd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/prep/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/sandpoint/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/sgimips/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/shark/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/sparc/cdroms/installcd/Makefile
cvs rdiff -u -r1.30 -r1.31 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/sun2/cdroms/installcd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/sun3/cdroms/installcd/Makefile
cvs rdiff -u -r1.17 -r1.18 src/distrib/vax/cdroms/installcd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/x68k/cdroms/installcd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/zaurus/cdroms/installcd/Makefile
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/alpha/stand/netboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp300/stand/inst/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hp300/stand/uboot/Makefile
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/misc/Makefile
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/stand/pxeboot/Makefile
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x68k/stand/loadbsd/Makefile
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/zaurus/stand/zboot/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/stand/zbsdmod/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/stand/efiboot/bootaa64/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/bootarm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/acorn32/cdroms/installcd/Makefile
diff -u src/distrib/acorn32/cdroms/installcd/Makefile:1.3 src/distrib/acorn32/cdroms/installcd/Makefile:1.4
--- src/distrib/acorn32/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:19 2018
+++ src/distrib/acorn32/cdroms/installcd/Makefile Mon Sep 23 09:42:30 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:19 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:30 christos Exp $
CDBASE= acorn32cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/alpha/cdroms/installcd/Makefile
diff -u src/distrib/alpha/cdroms/installcd/Makefile:1.3 src/distrib/alpha/cdroms/installcd/Makefile:1.4
--- src/distrib/alpha/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:19 2018
+++ src/distrib/alpha/cdroms/installcd/Makefile Mon Sep 23 09:42:30 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:19 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:30 christos Exp $
CDBASE= alphacd # gives ${CDBASE}.iso
CDINSTKERNEL= ../../instkernel/instkernel
CDKERNELS= netbsd netbsd
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
#make the CD bootable
Index: src/distrib/amd64/cdroms/installcd/Makefile
diff -u src/distrib/amd64/cdroms/installcd/Makefile:1.5 src/distrib/amd64/cdroms/installcd/Makefile:1.6
--- src/distrib/amd64/cdroms/installcd/Makefile:1.5 Fri Sep 28 11:05:20 2018
+++ src/distrib/amd64/cdroms/installcd/Makefile Mon Sep 23 09:42:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.6 2019/09/23 13:42:30 christos Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -8,7 +8,7 @@
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= amd64cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDBUILDEXTRA= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
Index: src/distrib/amiga/cdroms/installcd/Makefile
diff -u src/distrib/amiga/cdroms/installcd/Makefile:1.2 src/distrib/amiga/cdroms/installcd/Makefile:1.3
--- src/distrib/amiga/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:20 2018
+++ src/distrib/amiga/cdroms/installcd/Makefile Mon Sep 23 09:42:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:31 christos Exp $
CDBASE= amigacd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/arc/cdroms/installcd/Makefile
diff -u src/distrib/arc/cdroms/installcd/Makefile:1.4 src/distrib/arc/cdroms/installcd/Makefile:1.5
--- src/distrib/arc/cdroms/installcd/Makefile:1.4 Fri Sep 28 11:05:20 2018
+++ src/distrib/arc/cdroms/installcd/Makefile Mon Sep 23 09:42:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/23 13:42:31 christos Exp $
CDBASE= arccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-RAMDISK.gz netbsd
CDINSTKERNEL= ../../instkernel
Index: src/distrib/atari/cdroms/installcd/Makefile
diff -u src/distrib/atari/cdroms/installcd/Makefile:1.2 src/distrib/atari/cdroms/installcd/Makefile:1.3
--- src/distrib/atari/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:20 2018
+++ src/distrib/atari/cdroms/installcd/Makefile Mon Sep 23 09:42:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:31 christos Exp $
CDBASE= ataricd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/cats/cdroms/installcd/Makefile
diff -u src/distrib/cats/cdroms/installcd/Makefile:1.3 src/distrib/cats/cdroms/installcd/Makefile:1.4
--- src/distrib/cats/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:20 2018
+++ src/distrib/cats/cdroms/installcd/Makefile Mon Sep 23 09:42:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:31 christos Exp $
CDBASE= catscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL.aout netbsd
CDINSTKERNEL= ../../instkernel
Index: src/distrib/cobalt/cdroms/installcd/Makefile
diff -u src/distrib/cobalt/cdroms/installcd/Makefile:1.2 src/distrib/cobalt/cdroms/installcd/Makefile:1.3
--- src/distrib/cobalt/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:20 2018
+++ src/distrib/cobalt/cdroms/installcd/Makefile Mon Sep 23 09:42:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:31 christos Exp $
CDBASE= cobaltcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.41 src/distrib/common/Makefile.bootcd:1.42
--- src/distrib/common/Makefile.bootcd:1.41 Fri Sep 28 11:03:34 2018
+++ src/distrib/common/Makefile.bootcd Mon Sep 23 09:42:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.41 2018/09/28 15:03:34 martin Exp $
+# $NetBSD: Makefile.bootcd,v 1.42 2019/09/23 13:42:31 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -12,7 +12,7 @@
# CDBASE Basename of the iso
#
# Optional variables:
-# CDRELEASE Set to 'true' to include $RELEASEDIR/$MACHINE on the CD
+# CDRELEASE Set to 'true' to include $RELEASEDIR/$RELEASEMACHINEDIR on the CD
# CDRELEASE_NOISOS Excludes installation/cdrom directory if set
# CDRELEASE_NODEBUG Excludes debug sets if set
# CDSOURCE Set to 'true' to include $RELEASEDIR/source on the CD
Index: src/distrib/dreamcast/cdroms/installcd/Makefile
diff -u src/distrib/dreamcast/cdroms/installcd/Makefile:1.2 src/distrib/dreamcast/cdroms/installcd/Makefile:1.3
--- src/distrib/dreamcast/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:20 2018
+++ src/distrib/dreamcast/cdroms/installcd/Makefile Mon Sep 23 09:42:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:31 christos Exp $
CDBASE= dreamcastcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/emips/cdroms/installcd/Makefile
diff -u src/distrib/emips/cdroms/installcd/Makefile:1.3 src/distrib/emips/cdroms/installcd/Makefile:1.4
--- src/distrib/emips/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:20 2018
+++ src/distrib/emips/cdroms/installcd/Makefile Mon Sep 23 09:42:31 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:31 christos Exp $
CDBASE= emipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL.gz netbsd
CDINSTKERNEL= ../../instkernel
Index: src/distrib/evbarm/cdroms/installcd/Makefile
diff -u src/distrib/evbarm/cdroms/installcd/Makefile:1.3 src/distrib/evbarm/cdroms/installcd/Makefile:1.4
--- src/distrib/evbarm/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:20 2018
+++ src/distrib/evbarm/cdroms/installcd/Makefile Mon Sep 23 09:42:32 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:32 christos Exp $
CDBASE= evbarm-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/evbmips/cdroms/installcd/Makefile
diff -u src/distrib/evbmips/cdroms/installcd/Makefile:1.2 src/distrib/evbmips/cdroms/installcd/Makefile:1.3
--- src/distrib/evbmips/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:20 2018
+++ src/distrib/evbmips/cdroms/installcd/Makefile Mon Sep 23 09:42:32 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
CDBASE= evbmips-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/evbppc/cdroms/installcd/Makefile
diff -u src/distrib/evbppc/cdroms/installcd/Makefile:1.2 src/distrib/evbppc/cdroms/installcd/Makefile:1.3
--- src/distrib/evbppc/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:20 2018
+++ src/distrib/evbppc/cdroms/installcd/Makefile Mon Sep 23 09:42:32 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
CDBASE= evbppccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/evbsh3/cdroms/installcd/Makefile
diff -u src/distrib/evbsh3/cdroms/installcd/Makefile:1.2 src/distrib/evbsh3/cdroms/installcd/Makefile:1.3
--- src/distrib/evbsh3/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:20 2018
+++ src/distrib/evbsh3/cdroms/installcd/Makefile Mon Sep 23 09:42:32 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
CDBASE= evbsh3-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/ews4800mips/cdroms/installcd/Makefile
diff -u src/distrib/ews4800mips/cdroms/installcd/Makefile:1.2 src/distrib/ews4800mips/cdroms/installcd/Makefile:1.3
--- src/distrib/ews4800mips/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:21 2018
+++ src/distrib/ews4800mips/cdroms/installcd/Makefile Mon Sep 23 09:42:32 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
CDBASE= ews4800mipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/hp300/cdroms/installcd/Makefile
diff -u src/distrib/hp300/cdroms/installcd/Makefile:1.2 src/distrib/hp300/cdroms/installcd/Makefile:1.3
--- src/distrib/hp300/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:21 2018
+++ src/distrib/hp300/cdroms/installcd/Makefile Mon Sep 23 09:42:32 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
CDBASE= hp300cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/hpcarm/cdroms/installcd/Makefile
diff -u src/distrib/hpcarm/cdroms/installcd/Makefile:1.2 src/distrib/hpcarm/cdroms/installcd/Makefile:1.3
--- src/distrib/hpcarm/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:21 2018
+++ src/distrib/hpcarm/cdroms/installcd/Makefile Mon Sep 23 09:42:32 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
CDBASE= hpcarmcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/hpcmips/cdroms/installcd/Makefile
diff -u src/distrib/hpcmips/cdroms/installcd/Makefile:1.2 src/distrib/hpcmips/cdroms/installcd/Makefile:1.3
--- src/distrib/hpcmips/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:21 2018
+++ src/distrib/hpcmips/cdroms/installcd/Makefile Mon Sep 23 09:42:32 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:32 christos Exp $
CDBASE= hpcmipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/hpcsh/cdroms/installcd/Makefile
diff -u src/distrib/hpcsh/cdroms/installcd/Makefile:1.2 src/distrib/hpcsh/cdroms/installcd/Makefile:1.3
--- src/distrib/hpcsh/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:21 2018
+++ src/distrib/hpcsh/cdroms/installcd/Makefile Mon Sep 23 09:42:33 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
CDBASE= hpcshcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/hppa/cdroms/installcd/Makefile
diff -u src/distrib/hppa/cdroms/installcd/Makefile:1.2 src/distrib/hppa/cdroms/installcd/Makefile:1.3
--- src/distrib/hppa/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:21 2018
+++ src/distrib/hppa/cdroms/installcd/Makefile Mon Sep 23 09:42:33 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= hppacd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/i386/cdroms/installcd/Makefile
diff -u src/distrib/i386/cdroms/installcd/Makefile:1.9 src/distrib/i386/cdroms/installcd/Makefile:1.10
--- src/distrib/i386/cdroms/installcd/Makefile:1.9 Fri Sep 28 11:05:21 2018
+++ src/distrib/i386/cdroms/installcd/Makefile Mon Sep 23 09:42:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:33 christos Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -8,7 +8,7 @@
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= i386cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
Index: src/distrib/ia64/cdroms/installcd/Makefile
diff -u src/distrib/ia64/cdroms/installcd/Makefile:1.3 src/distrib/ia64/cdroms/installcd/Makefile:1.4
--- src/distrib/ia64/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:21 2018
+++ src/distrib/ia64/cdroms/installcd/Makefile Mon Sep 23 09:42:33 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:33 christos Exp $
CDBASE= ia64cd # gives ${CDBASE}.iso
#CDINSTKERNEL= ../../instkernel/instkernel
CDKERNELS= netbsd netbsd
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
# don't make the CD bootable, there is no installboot support for ia64
Index: src/distrib/ibmnws/cdroms/installcd/Makefile
diff -u src/distrib/ibmnws/cdroms/installcd/Makefile:1.2 src/distrib/ibmnws/cdroms/installcd/Makefile:1.3
--- src/distrib/ibmnws/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:21 2018
+++ src/distrib/ibmnws/cdroms/installcd/Makefile Mon Sep 23 09:42:33 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
CDBASE= ibmnwscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/luna68k/cdroms/installcd/Makefile
diff -u src/distrib/luna68k/cdroms/installcd/Makefile:1.2 src/distrib/luna68k/cdroms/installcd/Makefile:1.3
--- src/distrib/luna68k/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:21 2018
+++ src/distrib/luna68k/cdroms/installcd/Makefile Mon Sep 23 09:42:33 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
CDBASE= luna68kcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/macppc/cdroms/installcd/Makefile
diff -u src/distrib/macppc/cdroms/installcd/Makefile:1.4 src/distrib/macppc/cdroms/installcd/Makefile:1.5
--- src/distrib/macppc/cdroms/installcd/Makefile:1.4 Mon Nov 12 22:07:21 2018
+++ src/distrib/macppc/cdroms/installcd/Makefile Mon Sep 23 09:42:33 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/11/13 03:07:21 scole Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/23 13:42:33 christos Exp $
CDBASE= macppccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL.gz netbsd
CDKERNELS+= netbsd-INSTALL_601.gz netbsd.601
Index: src/distrib/mipsco/cdroms/installcd/Makefile
diff -u src/distrib/mipsco/cdroms/installcd/Makefile:1.2 src/distrib/mipsco/cdroms/installcd/Makefile:1.3
--- src/distrib/mipsco/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:22 2018
+++ src/distrib/mipsco/cdroms/installcd/Makefile Mon Sep 23 09:42:33 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:33 christos Exp $
CDBASE= mipscocd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/mvme68k/cdroms/installcd/Makefile
diff -u src/distrib/mvme68k/cdroms/installcd/Makefile:1.2 src/distrib/mvme68k/cdroms/installcd/Makefile:1.3
--- src/distrib/mvme68k/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:22 2018
+++ src/distrib/mvme68k/cdroms/installcd/Makefile Mon Sep 23 09:42:34 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:34 christos Exp $
CDBASE= mvme68kcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/mvmeppc/cdroms/installcd/Makefile
diff -u src/distrib/mvmeppc/cdroms/installcd/Makefile:1.2 src/distrib/mvmeppc/cdroms/installcd/Makefile:1.3
--- src/distrib/mvmeppc/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:22 2018
+++ src/distrib/mvmeppc/cdroms/installcd/Makefile Mon Sep 23 09:42:34 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:34 christos Exp $
CDBASE= mvmeppccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/news68k/cdroms/installcd/Makefile
diff -u src/distrib/news68k/cdroms/installcd/Makefile:1.2 src/distrib/news68k/cdroms/installcd/Makefile:1.3
--- src/distrib/news68k/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:22 2018
+++ src/distrib/news68k/cdroms/installcd/Makefile Mon Sep 23 09:42:34 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:34 christos Exp $
CDBASE= news68kcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/newsmips/cdroms/installcd/Makefile
diff -u src/distrib/newsmips/cdroms/installcd/Makefile:1.2 src/distrib/newsmips/cdroms/installcd/Makefile:1.3
--- src/distrib/newsmips/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:22 2018
+++ src/distrib/newsmips/cdroms/installcd/Makefile Mon Sep 23 09:42:34 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:34 christos Exp $
CDBASE= newsmipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/ofppc/cdroms/installcd/Makefile
diff -u src/distrib/ofppc/cdroms/installcd/Makefile:1.6 src/distrib/ofppc/cdroms/installcd/Makefile:1.7
--- src/distrib/ofppc/cdroms/installcd/Makefile:1.6 Fri Sep 28 11:05:22 2018
+++ src/distrib/ofppc/cdroms/installcd/Makefile Mon Sep 23 09:42:34 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.7 2019/09/23 13:42:34 christos Exp $
CDBASE= ofppccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS+= netbsd-INSTALL.gz netbsd
CDINSTKERNEL= ../../instkernel
Index: src/distrib/playstation2/cdroms/installcd/Makefile
diff -u src/distrib/playstation2/cdroms/installcd/Makefile:1.4 src/distrib/playstation2/cdroms/installcd/Makefile:1.5
--- src/distrib/playstation2/cdroms/installcd/Makefile:1.4 Fri Sep 28 11:05:22 2018
+++ src/distrib/playstation2/cdroms/installcd/Makefile Mon Sep 23 09:42:34 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/23 13:42:34 christos Exp $
CDBASE= playstation2cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/pmax/cdroms/installcd/Makefile
diff -u src/distrib/pmax/cdroms/installcd/Makefile:1.4 src/distrib/pmax/cdroms/installcd/Makefile:1.5
--- src/distrib/pmax/cdroms/installcd/Makefile:1.4 Fri Sep 28 11:05:22 2018
+++ src/distrib/pmax/cdroms/installcd/Makefile Mon Sep 23 09:42:34 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/23 13:42:34 christos Exp $
CDBASE= pmaxcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.if ${MACHINE_ARCH} == "mipsel"
CDKERNELS= netbsd-INSTALL.gz netbsd
Index: src/distrib/prep/cdroms/installcd/Makefile
diff -u src/distrib/prep/cdroms/installcd/Makefile:1.4 src/distrib/prep/cdroms/installcd/Makefile:1.5
--- src/distrib/prep/cdroms/installcd/Makefile:1.4 Fri Sep 28 11:05:22 2018
+++ src/distrib/prep/cdroms/installcd/Makefile Mon Sep 23 09:42:34 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/23 13:42:34 christos Exp $
CDBASE= prepcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDMAKEFSOPTIONS=bootimage=powerpc;cdrom/prep/installation/floppy/sysinst_com0.fs
Index: src/distrib/sandpoint/cdroms/installcd/Makefile
diff -u src/distrib/sandpoint/cdroms/installcd/Makefile:1.2 src/distrib/sandpoint/cdroms/installcd/Makefile:1.3
--- src/distrib/sandpoint/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:22 2018
+++ src/distrib/sandpoint/cdroms/installcd/Makefile Mon Sep 23 09:42:35 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:35 christos Exp $
CDBASE= sandpointcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/sgimips/cdroms/installcd/Makefile
diff -u src/distrib/sgimips/cdroms/installcd/Makefile:1.3 src/distrib/sgimips/cdroms/installcd/Makefile:1.4
--- src/distrib/sgimips/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:22 2018
+++ src/distrib/sgimips/cdroms/installcd/Makefile Mon Sep 23 09:42:35 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:35 christos Exp $
CDBASE= sgimipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL32_IP2x.gz ip2x
CDKERNELS+= netbsd-INSTALL32_IP3x.gz ip3x
Index: src/distrib/shark/cdroms/installcd/Makefile
diff -u src/distrib/shark/cdroms/installcd/Makefile:1.2 src/distrib/shark/cdroms/installcd/Makefile:1.3
--- src/distrib/shark/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:22 2018
+++ src/distrib/shark/cdroms/installcd/Makefile Mon Sep 23 09:42:35 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:35 christos Exp $
CDBASE= sharkcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/sparc/cdroms/installcd/Makefile
diff -u src/distrib/sparc/cdroms/installcd/Makefile:1.3 src/distrib/sparc/cdroms/installcd/Makefile:1.4
--- src/distrib/sparc/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:23 2018
+++ src/distrib/sparc/cdroms/installcd/Makefile Mon Sep 23 09:42:35 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:35 christos Exp $
CDBASE= sparccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
# for PRINTOBJDIR
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.30 src/distrib/sparc64/cdroms/installcd/Makefile:1.31
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.30 Fri Sep 28 11:05:23 2018
+++ src/distrib/sparc64/cdroms/installcd/Makefile Mon Sep 23 09:42:35 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.30 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: Makefile,v 1.31 2019/09/23 13:42:35 christos Exp $
.include <bsd.own.mk>
CDBASE= sparc64cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
-CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd
+CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
CD_SETS= base etc
.if ${MKKMOD} != "no"
CD_SETS+= modules
Index: src/distrib/sun2/cdroms/installcd/Makefile
diff -u src/distrib/sun2/cdroms/installcd/Makefile:1.2 src/distrib/sun2/cdroms/installcd/Makefile:1.3
--- src/distrib/sun2/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:23 2018
+++ src/distrib/sun2/cdroms/installcd/Makefile Mon Sep 23 09:42:35 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:35 christos Exp $
CDBASE= sun2cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/distrib/sun3/cdroms/installcd/Makefile
diff -u src/distrib/sun3/cdroms/installcd/Makefile:1.3 src/distrib/sun3/cdroms/installcd/Makefile:1.4
--- src/distrib/sun3/cdroms/installcd/Makefile:1.3 Fri Sep 28 11:05:23 2018
+++ src/distrib/sun3/cdroms/installcd/Makefile Mon Sep 23 09:42:35 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/23 13:42:35 christos Exp $
CDBASE= sun3cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
# for PRINTOBJDIR
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.17 src/distrib/vax/cdroms/installcd/Makefile:1.18
--- src/distrib/vax/cdroms/installcd/Makefile:1.17 Fri Sep 28 11:05:23 2018
+++ src/distrib/vax/cdroms/installcd/Makefile Mon Sep 23 09:42:35 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: Makefile,v 1.18 2019/09/23 13:42:35 christos Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
-CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
+CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
CDRELEASE_NOISOS=true
CD_SETS= base etc # no modules for VAX
Index: src/distrib/x68k/cdroms/installcd/Makefile
diff -u src/distrib/x68k/cdroms/installcd/Makefile:1.4 src/distrib/x68k/cdroms/installcd/Makefile:1.5
--- src/distrib/x68k/cdroms/installcd/Makefile:1.4 Fri Sep 28 11:05:23 2018
+++ src/distrib/x68k/cdroms/installcd/Makefile Mon Sep 23 09:42:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/23 13:42:36 christos Exp $
CDBASE= x68kcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDINSTKERNEL= ../../floppies/instkernel
CDKERNELS= netbsd-INSTALL.gz netbsd
Index: src/distrib/zaurus/cdroms/installcd/Makefile
diff -u src/distrib/zaurus/cdroms/installcd/Makefile:1.2 src/distrib/zaurus/cdroms/installcd/Makefile:1.3
--- src/distrib/zaurus/cdroms/installcd/Makefile:1.2 Fri Sep 28 11:05:23 2018
+++ src/distrib/zaurus/cdroms/installcd/Makefile Mon Sep 23 09:42:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:23 martin Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/23 13:42:36 christos Exp $
CDBASE= zauruscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Index: src/sys/arch/alpha/stand/netboot/Makefile
diff -u src/sys/arch/alpha/stand/netboot/Makefile:1.26 src/sys/arch/alpha/stand/netboot/Makefile:1.27
--- src/sys/arch/alpha/stand/netboot/Makefile:1.26 Fri Jul 20 11:23:02 2012
+++ src/sys/arch/alpha/stand/netboot/Makefile Mon Sep 23 09:42:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/07/20 15:23:02 matt Exp $
+# $NetBSD: Makefile,v 1.27 2019/09/23 13:42:36 christos Exp $
PROG = netboot
@@ -33,4 +33,4 @@ ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${
release: check_RELEASEDIR .WAIT ${PROG}
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/netboot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot
Index: src/sys/arch/hp300/stand/inst/Makefile
diff -u src/sys/arch/hp300/stand/inst/Makefile:1.9 src/sys/arch/hp300/stand/inst/Makefile:1.10
--- src/sys/arch/hp300/stand/inst/Makefile:1.9 Sun Dec 11 07:17:23 2005
+++ src/sys/arch/hp300/stand/inst/Makefile Mon Sep 23 09:42:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/11 12:17:23 christos Exp $
+# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:36 christos Exp $
PROGAOUT= inst
PROGSOURCE= inst.c
@@ -18,4 +18,4 @@ install:
release: check_RELEASEDIR .WAIT inst.lif
${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
- ${RELEASEDIR}/${MACHINE}/installation/misc/SYS_INST
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_INST
Index: src/sys/arch/hp300/stand/uboot/Makefile
diff -u src/sys/arch/hp300/stand/uboot/Makefile:1.8 src/sys/arch/hp300/stand/uboot/Makefile:1.9
--- src/sys/arch/hp300/stand/uboot/Makefile:1.8 Fri Jan 3 10:34:42 2003
+++ src/sys/arch/hp300/stand/uboot/Makefile Mon Sep 23 09:42:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/01/03 15:34:42 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2019/09/23 13:42:36 christos Exp $
PROGAOUT= uboot
PROGSOURCE= uboot.c tgets.c
@@ -30,4 +30,4 @@ install:
release: check_RELEASEDIR .WAIT uboot.lif
${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
- ${RELEASEDIR}/${MACHINE}/installation/misc/SYS_UBOOT
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_UBOOT
Index: src/sys/arch/i386/stand/dosboot/Makefile
diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.32 src/sys/arch/i386/stand/dosboot/Makefile:1.33
--- src/sys/arch/i386/stand/dosboot/Makefile:1.32 Thu Sep 12 22:19:45 2019
+++ src/sys/arch/i386/stand/dosboot/Makefile Mon Sep 23 09:42:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/09/13 02:19:45 manu Exp $
+# $NetBSD: Makefile,v 1.33 2019/09/23 13:42:36 christos Exp $
S= ${.CURDIR}/../../../..
@@ -37,6 +37,6 @@ VERSIONFILE= ${.CURDIR}/version
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} dosboot.com \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
.include "../Makefile.booters"
Index: src/sys/arch/i386/stand/misc/Makefile
diff -u src/sys/arch/i386/stand/misc/Makefile:1.11 src/sys/arch/i386/stand/misc/Makefile:1.12
--- src/sys/arch/i386/stand/misc/Makefile:1.11 Sat Jan 26 23:56:46 2019
+++ src/sys/arch/i386/stand/misc/Makefile Mon Sep 23 09:42:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/01/27 04:56:46 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2019/09/23 13:42:36 christos Exp $
.include <bsd.hostinit.mk>
@@ -13,8 +13,8 @@ release: check_RELEASEDIR .WAIT ${MISC_F
${_MKMSG_INSTALL} ${MISC_FILES}
cd ${.CURDIR} && \
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${MISC_FILES} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
${_MKMSG_INSTALL} ${UUDECODE_FILES}
cd ${.OBJDIR} && \
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${UUDECODE_FILES} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
Index: src/sys/arch/i386/stand/pxeboot/Makefile
diff -u src/sys/arch/i386/stand/pxeboot/Makefile:1.26 src/sys/arch/i386/stand/pxeboot/Makefile:1.27
--- src/sys/arch/i386/stand/pxeboot/Makefile:1.26 Thu Sep 12 22:19:46 2019
+++ src/sys/arch/i386/stand/pxeboot/Makefile Mon Sep 23 09:42:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/09/13 02:19:46 manu Exp $
+# $NetBSD: Makefile,v 1.27 2019/09/23 13:42:37 christos Exp $
S= ${.CURDIR}/../../../..
@@ -83,4 +83,4 @@ VERSIONFILE= ${.CURDIR}/../pxeboot/versi
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
Index: src/sys/arch/x68k/stand/loadbsd/Makefile
diff -u src/sys/arch/x68k/stand/loadbsd/Makefile:1.18 src/sys/arch/x68k/stand/loadbsd/Makefile:1.19
--- src/sys/arch/x68k/stand/loadbsd/Makefile:1.18 Sat Dec 10 09:06:44 2016
+++ src/sys/arch/x68k/stand/loadbsd/Makefile Mon Sep 23 09:42:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/12/10 14:06:44 rin Exp $
+# $NetBSD: Makefile,v 1.19 2019/09/23 13:42:37 christos Exp $
S= ${.CURDIR}/../../../..
@@ -48,8 +48,8 @@ ${BASE}${i}: ${OBJS} ${LIBDOS}/libdos.a
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
${TOOL_MANDOC_ASCII} ${DESTDIR}/usr/share/man/man8/x68k/loadbsd.8 > \
- ${RELEASEDIR}/${MACHINE}/installation/misc/loadbsd.0
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/loadbsd.0
${TOOL_MANDOC_HTML} ${DESTDIR}/usr/share/man/man8/x68k/loadbsd.8 > \
- ${RELEASEDIR}/${MACHINE}/installation/misc/loadbsd.html
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/loadbsd.html
Index: src/sys/arch/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.20 src/sys/arch/zaurus/stand/zboot/Makefile:1.21
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.20 Sat Apr 8 15:53:23 2017
+++ src/sys/arch/zaurus/stand/zboot/Makefile Mon Sep 23 09:42:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/04/08 19:53:23 christos Exp $
+# $NetBSD: Makefile,v 1.21 2019/09/23 13:42:37 christos Exp $
PROG= zboot
@@ -67,4 +67,4 @@ cleanlibdir:
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
Index: src/sys/arch/zaurus/stand/zbsdmod/Makefile
diff -u src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.10 src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.11
--- src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.10 Sun Jan 31 10:32:13 2016
+++ src/sys/arch/zaurus/stand/zbsdmod/Makefile Mon Sep 23 09:42:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/01/31 15:32:13 christos Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/23 13:42:37 christos Exp $
WARNS?= 4
@@ -30,4 +30,4 @@ CPPFLAGS+= -I${.OBJDIR} -I${S}
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${OBJS} \
- ${RELEASEDIR}/${MACHINE}/installation
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
Index: src/sys/stand/efiboot/bootaa64/Makefile
diff -u src/sys/stand/efiboot/bootaa64/Makefile:1.5 src/sys/stand/efiboot/bootaa64/Makefile:1.6
--- src/sys/stand/efiboot/bootaa64/Makefile:1.5 Sun Oct 28 06:17:47 2018
+++ src/sys/stand/efiboot/bootaa64/Makefile Mon Sep 23 09:42:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/10/28 10:17:47 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2019/09/23 13:42:37 christos Exp $
PROG= bootaa64.efi
OBJFMT= binary
@@ -17,4 +17,4 @@ CFLAGS+= -DEFIBOOT_ACPI
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
Index: src/sys/stand/efiboot/bootarm/Makefile
diff -u src/sys/stand/efiboot/bootarm/Makefile:1.1 src/sys/stand/efiboot/bootarm/Makefile:1.2
--- src/sys/stand/efiboot/bootarm/Makefile:1.1 Sat Mar 30 08:48:50 2019
+++ src/sys/stand/efiboot/bootarm/Makefile Mon Sep 23 09:42:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/03/30 12:48:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2019/09/23 13:42:37 christos Exp $
PROG= bootarm.efi
OBJFMT= binary
@@ -17,4 +17,4 @@ LDFLAGS+= -N
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
