diff options
| author | jkim <jkim@FreeBSD.org> | 2013-06-06 11:59:38 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-06-06 11:59:38 +0000 |
| commit | 9ac6b2587868eaeb9c688f9cfb39a93b1de7720c (patch) | |
| tree | b0ddd2962169588c122792af6d763899235a76db /gnu | |
| parent | e60ab9c72d61f9ec88a4887e299551d7c3234907 (diff) | |
| download | FreeBSD-src-9ac6b2587868eaeb9c688f9cfb39a93b1de7720c.zip FreeBSD-src-9ac6b2587868eaeb9c688f9cfb39a93b1de7720c.tar.gz | |
Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note this
actually reverts r250860 and r250861.
Reported by: gjb, tinderbox
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/diff/Makefile | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/grep/Makefile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile index 23070ee..c5c66dc 100644 --- a/gnu/usr.bin/diff/Makefile +++ b/gnu/usr.bin/diff/Makefile @@ -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 diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index 8c3d778..7d3b607 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -13,8 +13,7 @@ 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}/../../../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 \ |
