mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Adjust CFLAGS to pick up correct regex.h and posix/regex.h. Note this
actually reverts r250860 and r250861. Reported by: gjb, tinderbox
This commit is contained in:
parent
27a18d6a23
commit
ee852b9c75
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=251468
|
@ -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
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue