Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Consistently use ${RELEASEDIR}/${RELEASEMACHINE} instead of



details:   https://anonhg.NetBSD.org/src/rev/94e1cf514b42
branches:  trunk
changeset: 454631:94e1cf514b42
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Sep 23 13:42:30 2019 +0000

description:
Consistently use ${RELEASEDIR}/${RELEASEMACHINE} instead of
${RELEASEDIR}/${MACHINE} (Paul Ripke)

diffstat:

 distrib/acorn32/cdroms/installcd/Makefile      |  4 ++--
 distrib/alpha/cdroms/installcd/Makefile        |  4 ++--
 distrib/amd64/cdroms/installcd/Makefile        |  4 ++--
 distrib/amiga/cdroms/installcd/Makefile        |  4 ++--
 distrib/arc/cdroms/installcd/Makefile          |  4 ++--
 distrib/atari/cdroms/installcd/Makefile        |  4 ++--
 distrib/cats/cdroms/installcd/Makefile         |  4 ++--
 distrib/cobalt/cdroms/installcd/Makefile       |  4 ++--
 distrib/common/Makefile.bootcd                 |  4 ++--
 distrib/dreamcast/cdroms/installcd/Makefile    |  4 ++--
 distrib/emips/cdroms/installcd/Makefile        |  4 ++--
 distrib/evbarm/cdroms/installcd/Makefile       |  4 ++--
 distrib/evbmips/cdroms/installcd/Makefile      |  4 ++--
 distrib/evbppc/cdroms/installcd/Makefile       |  4 ++--
 distrib/evbsh3/cdroms/installcd/Makefile       |  4 ++--
 distrib/ews4800mips/cdroms/installcd/Makefile  |  4 ++--
 distrib/hp300/cdroms/installcd/Makefile        |  4 ++--
 distrib/hpcarm/cdroms/installcd/Makefile       |  4 ++--
 distrib/hpcmips/cdroms/installcd/Makefile      |  4 ++--
 distrib/hpcsh/cdroms/installcd/Makefile        |  4 ++--
 distrib/hppa/cdroms/installcd/Makefile         |  4 ++--
 distrib/i386/cdroms/installcd/Makefile         |  4 ++--
 distrib/ia64/cdroms/installcd/Makefile         |  4 ++--
 distrib/ibmnws/cdroms/installcd/Makefile       |  4 ++--
 distrib/luna68k/cdroms/installcd/Makefile      |  4 ++--
 distrib/macppc/cdroms/installcd/Makefile       |  4 ++--
 distrib/mipsco/cdroms/installcd/Makefile       |  4 ++--
 distrib/mvme68k/cdroms/installcd/Makefile      |  4 ++--
 distrib/mvmeppc/cdroms/installcd/Makefile      |  4 ++--
 distrib/news68k/cdroms/installcd/Makefile      |  4 ++--
 distrib/newsmips/cdroms/installcd/Makefile     |  4 ++--
 distrib/ofppc/cdroms/installcd/Makefile        |  4 ++--
 distrib/playstation2/cdroms/installcd/Makefile |  4 ++--
 distrib/pmax/cdroms/installcd/Makefile         |  4 ++--
 distrib/prep/cdroms/installcd/Makefile         |  4 ++--
 distrib/sandpoint/cdroms/installcd/Makefile    |  4 ++--
 distrib/sgimips/cdroms/installcd/Makefile      |  4 ++--
 distrib/shark/cdroms/installcd/Makefile        |  4 ++--
 distrib/sparc/cdroms/installcd/Makefile        |  4 ++--
 distrib/sparc64/cdroms/installcd/Makefile      |  6 +++---
 distrib/sun2/cdroms/installcd/Makefile         |  4 ++--
 distrib/sun3/cdroms/installcd/Makefile         |  4 ++--
 distrib/vax/cdroms/installcd/Makefile          |  6 +++---
 distrib/x68k/cdroms/installcd/Makefile         |  4 ++--
 distrib/zaurus/cdroms/installcd/Makefile       |  4 ++--
 sys/arch/alpha/stand/netboot/Makefile          |  4 ++--
 sys/arch/hp300/stand/inst/Makefile             |  4 ++--
 sys/arch/hp300/stand/uboot/Makefile            |  4 ++--
 sys/arch/i386/stand/dosboot/Makefile           |  4 ++--
 sys/arch/i386/stand/misc/Makefile              |  6 +++---
 sys/arch/i386/stand/pxeboot/Makefile           |  4 ++--
 sys/arch/x68k/stand/loadbsd/Makefile           |  8 ++++----
 sys/arch/zaurus/stand/zboot/Makefile           |  4 ++--
 sys/arch/zaurus/stand/zbsdmod/Makefile         |  4 ++--
 sys/stand/efiboot/bootaa64/Makefile            |  4 ++--
 sys/stand/efiboot/bootarm/Makefile             |  4 ++--
 56 files changed, 117 insertions(+), 117 deletions(-)

diffs (truncated from 755 to 300 lines):

diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/acorn32/cdroms/installcd/Makefile
--- a/distrib/acorn32/cdroms/installcd/Makefile Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/acorn32/cdroms/installcd/Makefile Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/alpha/cdroms/installcd/Makefile
--- a/distrib/alpha/cdroms/installcd/Makefile   Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/alpha/cdroms/installcd/Makefile   Mon Sep 23 13:42:30 2019 +0000
@@ -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
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/amd64/cdroms/installcd/Makefile
--- a/distrib/amd64/cdroms/installcd/Makefile   Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/amd64/cdroms/installcd/Makefile   Mon Sep 23 13:42:30 2019 +0000
@@ -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
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/amiga/cdroms/installcd/Makefile
--- a/distrib/amiga/cdroms/installcd/Makefile   Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/amiga/cdroms/installcd/Makefile   Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/arc/cdroms/installcd/Makefile
--- a/distrib/arc/cdroms/installcd/Makefile     Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/arc/cdroms/installcd/Makefile     Mon Sep 23 13:42:30 2019 +0000
@@ -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
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/atari/cdroms/installcd/Makefile
--- a/distrib/atari/cdroms/installcd/Makefile   Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/atari/cdroms/installcd/Makefile   Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/cats/cdroms/installcd/Makefile
--- a/distrib/cats/cdroms/installcd/Makefile    Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/cats/cdroms/installcd/Makefile    Mon Sep 23 13:42:30 2019 +0000
@@ -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
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/cobalt/cdroms/installcd/Makefile
--- a/distrib/cobalt/cdroms/installcd/Makefile  Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/cobalt/cdroms/installcd/Makefile  Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/common/Makefile.bootcd
--- a/distrib/common/Makefile.bootcd    Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/common/Makefile.bootcd    Mon Sep 23 13:42:30 2019 +0000
@@ -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
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/dreamcast/cdroms/installcd/Makefile
--- a/distrib/dreamcast/cdroms/installcd/Makefile       Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/dreamcast/cdroms/installcd/Makefile       Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/emips/cdroms/installcd/Makefile
--- a/distrib/emips/cdroms/installcd/Makefile   Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/emips/cdroms/installcd/Makefile   Mon Sep 23 13:42:30 2019 +0000
@@ -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
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/evbarm/cdroms/installcd/Makefile
--- a/distrib/evbarm/cdroms/installcd/Makefile  Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/evbarm/cdroms/installcd/Makefile  Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/evbmips/cdroms/installcd/Makefile
--- a/distrib/evbmips/cdroms/installcd/Makefile Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/evbmips/cdroms/installcd/Makefile Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/evbppc/cdroms/installcd/Makefile
--- a/distrib/evbppc/cdroms/installcd/Makefile  Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/evbppc/cdroms/installcd/Makefile  Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/evbsh3/cdroms/installcd/Makefile
--- a/distrib/evbsh3/cdroms/installcd/Makefile  Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/evbsh3/cdroms/installcd/Makefile  Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/ews4800mips/cdroms/installcd/Makefile
--- a/distrib/ews4800mips/cdroms/installcd/Makefile     Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/ews4800mips/cdroms/installcd/Makefile     Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/hp300/cdroms/installcd/Makefile
--- a/distrib/hp300/cdroms/installcd/Makefile   Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/hp300/cdroms/installcd/Makefile   Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/hpcarm/cdroms/installcd/Makefile
--- a/distrib/hpcarm/cdroms/installcd/Makefile  Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/hpcarm/cdroms/installcd/Makefile  Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/hpcmips/cdroms/installcd/Makefile
--- a/distrib/hpcmips/cdroms/installcd/Makefile Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/hpcmips/cdroms/installcd/Makefile Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/hpcsh/cdroms/installcd/Makefile
--- a/distrib/hpcsh/cdroms/installcd/Makefile   Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/hpcsh/cdroms/installcd/Makefile   Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/hppa/cdroms/installcd/Makefile
--- a/distrib/hppa/cdroms/installcd/Makefile    Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/hppa/cdroms/installcd/Makefile    Mon Sep 23 13:42:30 2019 +0000
@@ -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"
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/i386/cdroms/installcd/Makefile
--- a/distrib/i386/cdroms/installcd/Makefile    Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/i386/cdroms/installcd/Makefile    Mon Sep 23 13:42:30 2019 +0000
@@ -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
diff -r 8ad010dc1fb8 -r 94e1cf514b42 distrib/ia64/cdroms/installcd/Makefile
--- a/distrib/ia64/cdroms/installcd/Makefile    Mon Sep 23 12:00:57 2019 +0000
+++ b/distrib/ia64/cdroms/installcd/Makefile    Mon Sep 23 13:42:30 2019 +0000
@@ -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



Home | Main Index | Thread Index | Old Index