From 0ed4daa9c59c2f3a7fc91248ea618fd649278176 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 2 Feb 2015 05:46:36 +0000
Subject: [PATCH] MFC r277674:

r277674 (by ngie):

  Fix building rcorder with -DDEBUG by using libutil.h instead of util.h from
  usr.bin/make

  Sponsored by: EMC / Isilon Storage Division


git-svn-id: svn://svn.freebsd.org/base/stable/10@278055 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sbin/rcorder/Makefile  | 9 ++-------
 sbin/rcorder/rcorder.c | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index b71aa4b83..9ae976f7d 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -8,13 +8,8 @@ MAN=	rcorder.8
 LDADD=	-lutil
 DPADD=	${LIBUTIL}
 
-# XXX hack for make's hash.[ch]
-CFLAGS+= -DORDER -I.
+CFLAGS+= -DORDER
 
-SRCS+=	util.h
-CLEANFILES+=	util.h
-
-util.h:
-	ln -sf ${.CURDIR}/../../lib/libutil/libutil.h ${.TARGET}
+#CFLAGS+= -DDEBUG
 
 .include <bsd.prog.mk>
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 83f6df839..8c46b4fd1 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <stdio.h>
+#include <libutil.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <util.h>
 
 #include "ealloc.h"
 #include "sprite.h"
-- 
2.45.0