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"
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to