[src/trunk]: src/share/mk PR misc/54657: let RELEASEMACHINEDIR default to ${M...

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

details:   https://anonhg.NetBSD.org/src/rev/4dc4e571888e
branches:  trunk
changeset: 460698:4dc4e571888e
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 31 06:43:19 2019 +0000

description:
PR misc/54657: let RELEASEMACHINEDIR default to ${MACHINE}-${MACHINE_ARCH}
for evb{arm,mips,sh3}*.

diffstat:

 share/mk/bsd.README |  5 +++--
 share/mk/bsd.own.mk |  7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r a549350b2e63 -r 4dc4e571888e share/mk/bsd.README
--- a/share/mk/bsd.README       Thu Oct 31 01:55:12 2019 +0000
+++ b/share/mk/bsd.README       Thu Oct 31 06:43:19 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.394 2019/08/10 12:46:38 christos Exp $
+#      $NetBSD: bsd.README,v 1.395 2019/10/31 06:43:19 martin Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -796,7 +796,8 @@
 
 RELEASEMACHINEDIR
                Subdirectory used below RELEASEDIR when building
-               a release.  [${MACHINE}]
+               a release.  [${MACHINE},
+               or ${MACHINE}-${MACHINE_ARCH} for evb{arm,mips,sh3}*]
 
 RELEASEMACHINE Subdirectory or path component used for the following
                paths:
diff -r a549350b2e63 -r 4dc4e571888e share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Oct 31 01:55:12 2019 +0000
+++ b/share/mk/bsd.own.mk       Thu Oct 31 06:43:19 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1158 2019/10/24 18:46:20 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.1159 2019/10/31 06:43:19 martin Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -19,7 +19,12 @@
 #
 # Subdirectory used below ${RELEASEDIR} when building a release
 #
+.if !empty(MACHINE:Mevbarm) || !empty(MACHINE:Mevbmips) \
+       || !empty(MACHINE:Mevbsh3)
+RELEASEMACHINEDIR?=    ${MACHINE}-${MACHINE_ARCH}
+.else
 RELEASEMACHINEDIR?=    ${MACHINE}
+.endif
 
 #
 # Subdirectory or path component used for the following paths: