diff options
| author | obrien <obrien@FreeBSD.org> | 2004-03-17 07:40:42 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2004-03-17 07:40:42 +0000 |
| commit | 87ea083bbc9798c5a09962d208b2c8230d957861 (patch) | |
| tree | 80ff825ca243f1087f940bbff3f45c9d108af497 /gnu/usr.bin | |
| parent | 974081911f1eb5013c9160b39548f56a5a9578e0 (diff) | |
| download | FreeBSD-src-87ea083bbc9798c5a09962d208b2c8230d957861.zip FreeBSD-src-87ea083bbc9798c5a09962d208b2c8230d957861.tar.gz | |
Avoid the whole -I${DESTDIR}/usr/include/gnu issue by including
<gnu/regex.h> vs. just <regex.h>.
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/binutils/gasp/Makefile | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/gdb/Makefile | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile index 8749722..c2c6dba 100644 --- a/gnu/usr.bin/binutils/gasp/Makefile +++ b/gnu/usr.bin/binutils/gasp/Makefile @@ -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> diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile index cadd3b2..0104729 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile +++ b/gnu/usr.bin/binutils/gdb/Makefile @@ -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> |
