The GCC 2.96 snapshots have slightly different rules for finding include

files.  Mostly -I${.CURDIR} was needed -- especially for YACC generated
files as the new cpp does not look in the ultimate source file
(ie, the .y file)'s directory as told by the "#line" directive.  Some were
misspellings of "-I${.CURDIR}" as "-I.".

7 files changed, 9 insertions, 5 deletions

diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
index edea748..63eab50 100644
--- a/usr.sbin/atm/scspd/Makefile
+++ b/usr.sbin/atm/scspd/Makefile
@@ -35,7 +35,7 @@ SRCS=	scspd.c scsp_cafsm.c scsp_config.c scsp_config_lex.c \
 	scsp_timer.c
 MAN8=	scspd.8
 
-CFLAGS+=	-I${.CURDIR}/../../../sys -I${.OBJDIR}
+CFLAGS+=	-I${.CURDIR}/../../../sys -I${.CURDIR} -I${.OBJDIR}
 LDADD+=		-latm -lmd
 DPADD+=		${LIBATM} ${LIBMD}
 
diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile
index 5c05b85..74b5d5f 100644
--- a/usr.sbin/i4b/isdnd/Makefile
+++ b/usr.sbin/i4b/isdnd/Makefile
@@ -7,7 +7,8 @@ SRCS	=	rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c	\
 		exec.c dial.c monitor.c pcause.c controller.c alias.c	\
 		y.tab.h holiday.c
 
-COPTS	+=	-I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel -I${.OBJDIR}
+COPTS	+=	-I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel
+COPTS	+=	-I${.CURDIR} -I${.OBJDIR}
 
 # compile debug support
 COPTS	+=	-DDEBUG
diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile
index a2ff5b1..9873d9a 100644
--- a/usr.sbin/kbdcontrol/Makefile
+++ b/usr.sbin/kbdcontrol/Makefile
@@ -2,6 +2,7 @@
 
 PROG=	kbdcontrol
 SRCS=	kbdcontrol.c lex.l
+CFLAGS+= -I${.CURDIR}
 MAN1=	kbdcontrol.1
 MAN5=	kbdmap.5
 MLINKS= kbdmap.5 keymap.5
diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc
index bd9211e..cbebbcb 100644
--- a/usr.sbin/named/Makefile.inc
+++ b/usr.sbin/named/Makefile.inc
@@ -16,7 +16,8 @@ DESTRUN=	/var/run
 DESTSBIN=	/usr/sbin
 DESTHELP=	/usr/share/misc
 
-CFLAGS+=	-I${BIND_DIR}/port/freebsd/include
+CFLAGS+=	-I${BIND_DIR}/port/freebsd/include \
+		-I${.CURDIR}/../../contrib/bind/bin/named
 
 # This is mostly for named and named-xfer
 .if defined(USE_LIBBIND)
diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index c3a51a4..c9b31f2 100644
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -11,6 +11,7 @@ SRCS=	main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l
 MAN8=	nslookup.8
 
 CFLAGS+=-D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\"
+CFLAGS+=-I${.CURDIR}/../../contrib/bind/bin/nslookup
 LDADD+=	-ll -ledit -ltermcap
 DPADD+=	${LIBL} ${LIBEDIT} ${LIBTERMCAP}
 
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index 42a0195..c459656 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -17,7 +17,7 @@ PROG=	rrenumd
 SRCS=	rrenumd.c  parser.y lexer.l
 YFLAGS+=	-d
 
-CFLAGS+= -DINET6 -DIPSEC -I${.OBJDIR}
+CFLAGS+= -DINET6 -DIPSEC -I${.CURDIR} -I${.OBJDIR}
 LDADD=	-lipsec -lcompat -ll -ly
 DPADD=	${LIBIPSEC} ${LIBCOMPAT} ${LIBL} ${LIBY}
 
diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile
index 8feb0a6..3caf739 100644
--- a/usr.sbin/setkey/Makefile
+++ b/usr.sbin/setkey/Makefile
@@ -29,7 +29,7 @@
 PROG=	setkey
 SRCS=	setkey.c parse.y token.l
 CFLAGS+=-g
-CFLAGS+=-I${.CURDIR}/../../lib/libipsec
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
 DPADD=	${LIBL} ${LIBY}
 LDADD=	-ll -ly
 CLEANFILES+=	y.tab.c y.tab.h key_test.o keytest