Merge sync of head

3 files changed, 4 insertions, 12 deletions

diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index b71aa4b83d37..2f1bbac1fa8f 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -5,16 +5,10 @@ PROG=   rcorder
 SRCS=   ealloc.c hash.c rcorder.c
 MAN=	rcorder.8
 
-LDADD=	-lutil
-DPADD=	${LIBUTIL}
+LIBADD=	util
 
-# 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/Makefile.depend b/sbin/rcorder/Makefile.depend
index ed049c94b327..78b235bef5b2 100644
--- a/sbin/rcorder/Makefile.depend
+++ b/sbin/rcorder/Makefile.depend
@@ -17,6 +17,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-rcorder.o: util.h
-rcorder.po: util.h
 .endif
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 83f6df839682..8c46b4fd1def 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"