summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-06-05 21:31:06 +0000
committerjkim <jkim@FreeBSD.org>2013-06-05 21:31:06 +0000
commit38367105c6482fdf5b51fafda300ef24f1651cce (patch)
tree0854d98b2b279a999a301ce4d4660e4d19bf104c /gnu/usr.bin
parenta0a010b378f8a0c9defeb337373b34dd41754955 (diff)
downloadFreeBSD-src-38367105c6482fdf5b51fafda300ef24f1651cce.zip
FreeBSD-src-38367105c6482fdf5b51fafda300ef24f1651cce.tar.gz
Connect libgnuregex 2.17 to the build.
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/diff/Makefile3
-rw-r--r--gnu/usr.bin/grep/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index 06500b1..23070ee 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -17,10 +17,11 @@ 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}/../../lib/libregex
+CFLAGS+=-I${.CURDIR}/../../../contrib/libgnuregex
SUBDIR+=doc
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index d4da881..8c3d778 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -13,7 +13,8 @@ SRCS= closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
xstrtoumax.c
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../lib/libregex -DHAVE_CONFIG_H
+CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../../contrib/libgnuregex
+CFLAGS+=-DHAVE_CONFIG_H -D__USE_GNU
.if ${MK_BSD_GREP} != "yes"
LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \
OpenPOWER on IntegriCloud