Include libutil's headers directly from src to avoid recording a dirdeps

dependency for META MODE.

diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile
index 9f93215b2bb745e47bac41a7a0d413a9ceefb7c4..b559b7f64d0b41dfb3da570d361646b05ed5f344 100644 (file)
--- 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 58f9a3347b00a32cf3146b1e10fa96531af8ecf4..3646e2e2b1afa1ccd2f1b363f15b71c9bd40448f 100644 (file)
--- 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>