From owner-svn-src-all@FreeBSD.ORG  Mon Feb  2 05:46:38 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EE810377;
 Mon,  2 Feb 2015 05:46:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA19ADCA;
 Mon,  2 Feb 2015 05:46:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t125kbqs052412;
 Mon, 2 Feb 2015 05:46:37 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t125kbOT052408;
 Mon, 2 Feb 2015 05:46:37 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502020546.t125kbOT052408@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 2 Feb 2015 05:46:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r278055 - stable/10/sbin/rcorder
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2015 05:46:38 -0000

Author: ngie
Date: Mon Feb  2 05:46:36 2015
New Revision: 278055
URL: https://svnweb.freebsd.org/changeset/base/278055

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/10/sbin/rcorder/Makefile
  stable/10/sbin/rcorder/rcorder.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/rcorder/Makefile
==============================================================================
--- stable/10/sbin/rcorder/Makefile	Mon Feb  2 05:44:34 2015	(r278054)
+++ stable/10/sbin/rcorder/Makefile	Mon Feb  2 05:46:36 2015	(r278055)
@@ -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/10/sbin/rcorder/rcorder.c
==============================================================================
--- stable/10/sbin/rcorder/rcorder.c	Mon Feb  2 05:44:34 2015	(r278054)
+++ stable/10/sbin/rcorder/rcorder.c	Mon Feb  2 05:46:36 2015	(r278055)
@@ -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"