Avoid the whole -I${DESTDIR}/usr/include/gnu issue by including

<gnu/regex.h> vs. just <regex.h>.
This commit is contained in:
obrien 2004-03-17 07:40:42 +00:00
parent 974081911f
commit 87ea083bbc
2 changed files with 5 additions and 6 deletions

View File

@ -5,7 +5,7 @@
.PATH: ${SRCDIR}/gas
PROG= gasp
SRCS+= gasp+%FIXED.c macro.c sb.c hash.c
SRCS+= gasp.c macro.c sb.c hash.c xregex.h
WARNS?= 2
CFLAGS+= -DBFD_ASSEMBLER
CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd -I${.CURDIR}/../as
@ -13,9 +13,9 @@ CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${SRCDIR} -I${SRCDIR}/gas -I${SRCDIR}/gas/config
DPADD= ${RELTOP}/libiberty/libiberty.a
LDADD= ${DPADD}
CLEANFILES= gasp+%FIXED.c
CLEANFILES= xregex.h
gasp+%FIXED.c: gasp.c
sed -e 's|xregex\.h|regex.h|g' ${.ALLSRC} >${.TARGET}
xregex.h:
@echo '#include <gnu/regex.h>' >${.TARGET}
.include <bsd.prog.mk>

View File

@ -58,7 +58,6 @@ CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch
CFLAGS+= -I${.CURDIR}/${TARGET_ARCH}
CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd
CFLAGS+= -I${GDBDIR}/gdb -I${GDBDIR}/gdb/config
CFLAGS+= -I${DESTDIR}/usr/include/gnu
CFLAGS+= -I$(.CURDIR)
YFLAGS=
@ -136,6 +135,6 @@ gdbversion.c: Makefile
@echo 'const char target_name[] = "${TARGET_ARCH}-undermydesk-freebsd";' >>${.TARGET}
xregex.h:
@echo '#include <regex.h>' >${.TARGET}
@echo '#include <gnu/regex.h>' >${.TARGET}
.include <bsd.prog.mk>