From d39483a90d636f55e2ec104f730efdea293e693c Mon Sep 17 00:00:00 2001
From: skrll <skrll@NetBSD.org>
Date: Thu, 11 May 2023 08:49:41 +0000
Subject: [PATCH] risc-v: use ${MACHINE}-${MACHINE_ARCH} for the default
 RELEASEMACHINEDIR

Hopefully, this fixes the release binaries being available on cdn/nyftp.
---
 share/mk/bsd.own.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 3e5b7c29f013..22eb831eddf6 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1314 2023/05/10 16:46:39 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.1315 2023/05/11 08:49:41 skrll Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -28,8 +28,11 @@ MACHINE_MIPS64= 	0
 #
 # Subdirectory used below ${RELEASEDIR} when building a release
 #
-.if ${MACHINE:Mevbarm} || ${MACHINE:Mevbmips} \
-	|| ${MACHINE:Mevbsh3}
+.if \
+    ${MACHINE:Mevbarm} || \
+    ${MACHINE:Mevbmips} || \
+    ${MACHINE:Mevbsh3} || \
+    ${MACHINE:Mriscv}
 RELEASEMACHINEDIR?=	${MACHINE}-${MACHINE_ARCH}
 .else
 RELEASEMACHINEDIR?=	${MACHINE}