From 86b7cda9e0c172ded9abd9c57a1098050b966b28 Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Thu, 31 Oct 2019 09:44:13 +0000
Subject: [PATCH] After RELEASEMACHINEDIR has the right defaults now, simplify
 subdir settings and do not hardcode any architecture exceptions.

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

diff --git a/usr.sbin/sysinst/Makefile.inc b/usr.sbin/sysinst/Makefile.inc
index de94080183d9..e61d9f33773e 100644
--- a/usr.sbin/sysinst/Makefile.inc
+++ b/usr.sbin/sysinst/Makefile.inc
@@ -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 @@ CPPFLAGS+=	-I. -I${.CURDIR}/../.. -I${.CURDIR} \
 		${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