svn commit: r251468 - in head: gnu/usr.bin/diff gnu/usr.bin/grep usr.bin/grep

[Jung-uk Kim]

Author: jkim
Date: Thu Jun  6 11:59:38 2013
New Revision: 251468
URL: http://svnweb.freebsd.org/changeset/base/251468

Log:
  Adjust CFLAGS to pick up correct regex.h and posix/regex.h.  Note this
  actually reverts r250860 and r250861.
  
  Reported by:	gjb, tinderbox

Modified:
  head/gnu/usr.bin/diff/Makefile
  head/gnu/usr.bin/grep/Makefile
  head/usr.bin/grep/Makefile

Modified: head/gnu/usr.bin/diff/Makefile
==============================================================================
--- head/gnu/usr.bin/diff/Makefile	Thu Jun  6 11:47:54 2013	(r251467)
+++ head/gnu/usr.bin/diff/Makefile	Thu Jun  6 11:59:38 2013	(r251468)
@@ -17,11 +17,10 @@ CFLAGS+=-funsigned-char
 
 CFLAGS+=-DHAVE_CONFIG_H
 CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
-CFLAGS+=-D__USE_GNU
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
-CFLAGS+=-I${.CURDIR}/../../../contrib/libgnuregex
+CFLAGS+=-I${DESTDIR}/usr/include/gnu
 
 SUBDIR+=doc
 

Modified: head/gnu/usr.bin/grep/Makefile
==============================================================================
--- head/gnu/usr.bin/grep/Makefile	Thu Jun  6 11:47:54 2013	(r251467)
+++ head/gnu/usr.bin/grep/Makefile	Thu Jun  6 11:59:38 2013	(r251468)
@@ -13,8 +13,7 @@ SRCS=	closeout.c dfa.c error.c exclude.c
 	isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
 	xstrtoumax.c
 
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../../contrib/libgnuregex
-CFLAGS+=-DHAVE_CONFIG_H -D__USE_GNU
+CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
 
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \

Modified: head/usr.bin/grep/Makefile
==============================================================================
--- head/usr.bin/grep/Makefile	Thu Jun  6 11:47:54 2013	(r251467)
+++ head/usr.bin/grep/Makefile	Thu Jun  6 11:59:38 2013	(r251468)
@@ -74,7 +74,7 @@ CFLAGS+= -DWITHOUT_BZIP2
 .endif
 
 .if !defined(WITHOUT_GNU_COMPAT)
-CFLAGS+= -I/usr/include/gnu
+CFLAGS+= -I${DESTDIR}/usr/include/gnu
 LDADD+=	-lgnuregex
 DPADD+=	${LIBGNUREGEX}
 .endif