Module Name: src
Committed By: martin
Date: Thu Oct 31 06:43:19 UTC 2019
Modified Files:
src/share/mk: bsd.README bsd.own.mk
Log Message:
PR misc/54657: let RELEASEMACHINEDIR default to ${MACHINE}-${MACHINE_ARCH}
for evb{arm,mips,sh3}*.
To generate a diff of this commit:
cvs rdiff -u -r1.394 -r1.395 src/share/mk/bsd.README
cvs rdiff -u -r1.1158 -r1.1159 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.394 src/share/mk/bsd.README:1.395
--- src/share/mk/bsd.README:1.394 Sat Aug 10 12:46:38 2019
+++ src/share/mk/bsd.README Thu Oct 31 06:43:19 2019
@@ -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 @@ MAKEDIRTARGET dir target [params]
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:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1158 src/share/mk/bsd.own.mk:1.1159
--- src/share/mk/bsd.own.mk:1.1158 Thu Oct 24 18:46:20 2019
+++ src/share/mk/bsd.own.mk Thu Oct 31 06:43:19 2019
@@ -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 @@ MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/
#
# 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:
