From 2ce19cdb840ca020b8d155382afd63a64a437cf9 Mon Sep 17 00:00:00 2001
From: ache <ache@FreeBSD.org>
Date: Fri, 5 Mar 2004 01:47:03 +0000
Subject: Move -I${DESTDIR}/usr/include/gnu up, before -I${DESTDIR}/usr/include
 to pick correct regex.h

---
 gnu/usr.bin/binutils/gasp/Makefile | 4 +++-
 gnu/usr.bin/binutils/gdb/Makefile  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'gnu/usr.bin')

diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile
index 237474a..817aa43 100644
--- a/gnu/usr.bin/binutils/gasp/Makefile
+++ b/gnu/usr.bin/binutils/gasp/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+# must be before -I${DESTDIR}/usr/include
+CFLAGS+= -I${DESTDIR}/usr/include/gnu
+
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/gas
@@ -10,7 +13,6 @@ WARNS?=	2
 CFLAGS+= -DBFD_ASSEMBLER
 CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd -I${.CURDIR}/../as
 CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${DESTDIR}/usr/include/gnu
 CFLAGS+= -I${SRCDIR} -I${SRCDIR}/gas -I${SRCDIR}/gas/config
 DPADD=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index cadd3b2..d2e0bdd 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,6 +1,9 @@
 # ex:ts=8
 # $FreeBSD$
 
+# must be before -I${DESTDIR}/usr/include
+CFLAGS+= -I${DESTDIR}/usr/include/gnu
+
 .include "../Makefile.inc0"
 
 GDBDIR= ${.CURDIR}/../../../../contrib/gdb
@@ -58,7 +61,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=
-- 
cgit v1.1