From owner-svn-src-projects@FreeBSD.ORG  Sun Nov 30 09:03:35 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 7281CC0A;
 Sun, 30 Nov 2014 09:03:35 +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 5E5B5ACE;
 Sun, 30 Nov 2014 09:03:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU93ZuD047420;
 Sun, 30 Nov 2014 09:03:35 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU93YVp047418;
 Sun, 30 Nov 2014 09:03:34 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411300903.sAU93YVp047418@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: Sun, 30 Nov 2014 09:03:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275306 - projects/building-blocks/sbin/rcorder
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Nov 2014 09:03:35 -0000

Author: ngie
Date: Sun Nov 30 09:03:34 2014
New Revision: 275306
URL: https://svnweb.freebsd.org/changeset/base/275306

Log:
  Fix CFLAGS+=-DDEBUG by using the right header for libutil (libutil.h, not
  util.h)

Modified:
  projects/building-blocks/sbin/rcorder/Makefile
  projects/building-blocks/sbin/rcorder/rcorder.c

Modified: projects/building-blocks/sbin/rcorder/Makefile
==============================================================================
--- projects/building-blocks/sbin/rcorder/Makefile	Sun Nov 30 08:43:55 2014	(r275305)
+++ projects/building-blocks/sbin/rcorder/Makefile	Sun Nov 30 09:03:34 2014	(r275306)
@@ -7,13 +7,11 @@ MAN=	rcorder.8
 
 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
+.if ${CFLAGS:M*-DDEBUG}
+CFLAGS+= -I${.CURDIR}/../../usr.bin/make
+.endif
 
 .include <bsd.prog.mk>

Modified: projects/building-blocks/sbin/rcorder/rcorder.c
==============================================================================
--- projects/building-blocks/sbin/rcorder/rcorder.c	Sun Nov 30 08:43:55 2014	(r275305)
+++ projects/building-blocks/sbin/rcorder/rcorder.c	Sun Nov 30 09:03:34 2014	(r275306)
@@ -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"