svn commit: r278064 - stable/9/sbin/rcorder

[Garrett Cooper]

Author: ngie
Date: Mon Feb  2 08:37:45 2015
New Revision: 278064
URL: https://svnweb.freebsd.org/changeset/base/278064

Log:
  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

Modified:
  stable/9/sbin/rcorder/Makefile
  stable/9/sbin/rcorder/rcorder.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sbin/   (props changed)
  stable/9/sbin/rcorder/   (props changed)

Modified: stable/9/sbin/rcorder/Makefile
==============================================================================
--- stable/9/sbin/rcorder/Makefile	Mon Feb  2 08:05:11 2015	(r278063)
+++ stable/9/sbin/rcorder/Makefile	Mon Feb  2 08:37:45 2015	(r278064)
@@ -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>

Modified: stable/9/sbin/rcorder/rcorder.c
==============================================================================
--- stable/9/sbin/rcorder/rcorder.c	Mon Feb  2 08:05:11 2015	(r278063)
+++ stable/9/sbin/rcorder/rcorder.c	Mon Feb  2 08:37:45 2015	(r278064)
@@ -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"