[src/trunk]: src/usr.sbin/sysinst After RELEASEMACHINEDIR has the right defau...

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

details:   https://anonhg.NetBSD.org/src/rev/842d423ca9a2
branches:  trunk
changeset: 460699:842d423ca9a2
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 31 09:44:13 2019 +0000

description:
After RELEASEMACHINEDIR has the right defaults now, simplify subdir settings
and do not hardcode any architecture exceptions.

diffstat:

 usr.sbin/sysinst/Makefile.inc |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (22 lines):

diff -r 4dc4e571888e -r 842d423ca9a2 usr.sbin/sysinst/Makefile.inc
--- a/usr.sbin/sysinst/Makefile.inc     Thu Oct 31 06:43:19 2019 +0000
+++ b/usr.sbin/sysinst/Makefile.inc     Thu Oct 31 09:44:13 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.27 2019/10/13 07:28:21 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.28 2019/10/31 09:44:13 martin Exp $
 #
 # Makefile for sysinst
 
@@ -74,10 +74,8 @@
                ${NODISKLABEL:D-DNO_DISKLABEL} \
                ${NOPARTMAN:D-DNO_PARTMAN}
 
-.if ${MACHINE} == "evbarm" \
-    || ${MACHINE} == "evbmips" \
-    || ${MACHINE} == "evbsh3"
-CPPFLAGS+=     -DARCH_SUBDIR="\"${MACHINE}-${MACHINE_ARCH}\""
+.if ${RELEASEMACHINEDIR} != ${MACHINE}
+CPPFLAGS+=     -DARCH_SUBDIR="\"${RELEASEMACHINEDIR}\""
 CPPFLAGS+=     -DPKG_ARCH_SUBDIR="\"${MACHINE_ARCH}\""
 .endif