From e6b0222d6006e7878d9c8d96c8c3e04fa9720d6e Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 28 Oct 2015 16:31:04 +0000
Subject: [PATCH] Include libutil's headers directly from src to avoid
 recording a dirdeps dependency for META MODE.

---
 usr.sbin/mpsutil/Makefile        | 3 ++-
 usr.sbin/mpsutil/Makefile.depend | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile
index 9f93215b2bb..b559b7f64d0 100644
--- a/usr.sbin/mpsutil/Makefile
+++ b/usr.sbin/mpsutil/Makefile
@@ -11,7 +11,8 @@ LINKS=	${BINDIR}/mpsutil ${BINDIR}/mprutil
 MLINKS=	mpsutil.8 mprutil.8
 
 CFLAGS+= -I${.CURDIR}/../../sys -I. -DUSE_MPT_IOCTLS
-
+# Avoid dirdep dependency on libutil
+CFLAGS+= -I${SRCTOP}/lib/libutil
 
 # Here be dragons
 .ifdef DEBUG
diff --git a/usr.sbin/mpsutil/Makefile.depend b/usr.sbin/mpsutil/Makefile.depend
index 58f9a3347b0..3646e2e2b1a 100644
--- a/usr.sbin/mpsutil/Makefile.depend
+++ b/usr.sbin/mpsutil/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libutil \
 
 
 .include <dirdeps.mk>