From a3a8eabcdc9c603cbd57e4eba8b1485e03e7fd12 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 23 Apr 2024 11:47:26 -0700
Subject: [PATCH] nvmecontrol: Always build instead of being conditional on
 WITH_NVME

This now builds fine on all platforms so always include it similar
to other tools such as camcontrol.

Reviewed by:	imp, emaste
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D44842

(cherry picked from commit 2d51a9898e26c87586ba50e71b6b3fdf1591713d)
---
 sbin/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/Makefile b/sbin/Makefile
index c125075c669..cbfff38cc62 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -52,6 +52,7 @@ SUBDIR=adjkerntz \
 	newfs_msdos \
 	nfsiod \
 	nos-tun \
+	nvmecontrol \
 	pfilctl \
 	rcorder \
 	reboot \
@@ -78,7 +79,6 @@ SUBDIR.${MK_INET6}+=	rtsol
 SUBDIR.${MK_IPFILTER}+=	ipf
 SUBDIR.${MK_IPFW}+=	ipfw
 SUBDIR.${MK_IPFW}+=	natd
-SUBDIR.${MK_NVME}+=	nvmecontrol
 SUBDIR.${MK_OPENSSL}+=	decryptcore
 SUBDIR.${MK_PF}+=	pfctl
 SUBDIR.${MK_PF}+=	pflogd