diff options
-rw-r--r-- | gnu/usr.bin/binutils/gasp/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/binutils/gdb/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/cvs/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/lib/Makefile | 3 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/libdiff/Makefile | 3 | ||||
-rw-r--r-- | gnu/usr.bin/diff/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/grep/Makefile | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile index 3d15060..1ea36d9 100644 --- a/gnu/usr.bin/binutils/gasp/Makefile +++ b/gnu/usr.bin/binutils/gasp/Makefile @@ -10,7 +10,7 @@ WARNS= 2 CFLAGS+= -DBFD_ASSEMBLER CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd -I${.CURDIR}/../as CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../../../../include/gnu +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 bd33327..70434b3 100644 --- a/gnu/usr.bin/binutils/gdb/Makefile +++ b/gnu/usr.bin/binutils/gdb/Makefile @@ -58,7 +58,7 @@ 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${.CURDIR}/../../../../../include/gnu +CFLAGS+= -I${DESTDIR}/usr/include/gnu CFLAGS+= -I$(.CURDIR) YFLAGS= diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index dced5e5..7010f69 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -26,7 +26,7 @@ SRCS= add.c admin.c annotate.c buffer.c \ # gnu must be before lib to pick correct regex.h CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \ - -I${.CURDIR}/../../../../../include/gnu \ + -I${DESTDIR}/usr/include/gnu \ -I${CVSDIR}/lib -I${CVSDIR}/diff -I. DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile index 02f8e53..46e10b9 100644 --- a/gnu/usr.bin/cvs/lib/Makefile +++ b/gnu/usr.bin/cvs/lib/Makefile @@ -12,8 +12,7 @@ LIB= cvs INTERNALLIB= YES # gnu must be before lib to pick correct regex.h -CFLAGS+= -I. -I${CVSDIR}/src \ - -I${.CURDIR}/../../../../../include/gnu \ +CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}/usr/include/gnu \ -I${CVSDIR}/lib CFLAGS+= -DHAVE_CONFIG_H YFLAGS= diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile index 534b82d..edf4ebc 100644 --- a/gnu/usr.bin/cvs/libdiff/Makefile +++ b/gnu/usr.bin/cvs/libdiff/Makefile @@ -10,8 +10,7 @@ LIB= diff INTERNALLIB= YES # gnu must be before lib to pick correct regex.h -CFLAGS+= -I../lib \ - -I${.CURDIR}/../../../../../include/gnu \ +CFLAGS+= -I../lib -I${DESTDIR}/usr/include/gnu \ -I${CVSDIR}/lib -DHAVE_CONFIG_H SRCS = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \ diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile index 58a9d1f..f9f329b 100644 --- a/gnu/usr.bin/diff/Makefile +++ b/gnu/usr.bin/diff/Makefile @@ -10,7 +10,7 @@ SRCS= analyze.c cmpbuf.c context.c diff.c dir.c ed.c \ CFLAGS+=-funsigned-char CFLAGS+=-I${.CURDIR}/../../../contrib/diff \ - -I${.CURDIR}/../../../../include/gnu + -I${DESTDIR}/usr/include/gnu CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\" diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile index 9300216..c854695 100644 --- a/gnu/usr.bin/grep/Makefile +++ b/gnu/usr.bin/grep/Makefile @@ -5,7 +5,7 @@ GREP_LIBZ=YES PROG= grep SRCS= dfa.c grep.c kwset.c obstack.c savedir.c search.c -CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../../../include/gnu -DHAVE_CONFIG_H +CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ ${BINDIR}/grep ${BINDIR}/fgrep |