Bring in my changes for removing the pestilent obj links (unless you

really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.

3 files changed, 3 insertions, 3 deletions

diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile
index c67b3f6..398736f 100644
--- a/usr.sbin/pcvt/kbdio/Makefile
+++ b/usr.sbin/pcvt/kbdio/Makefile
@@ -25,7 +25,7 @@ LDADD=	-lm -ly -ll
 NOMAN=
 NOSHARED=	no shared linkage
 
-CFLAGS+= -I${.CURDIR}/obj -I${.CURDIR} #-g
+CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g
 
 CLEANFILES+= kbdio.c lex.c lex.yy.c y.tab.[ch]
 CLEANFILES+= y.output	# comment file from bison
diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index 4826870..dee4f45 100644
--- a/usr.sbin/pcvt/kcon/Makefile
+++ b/usr.sbin/pcvt/kcon/Makefile
@@ -5,6 +5,6 @@ CFLAGS+= 	-I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
 # the -Lfoo could be omitted if libkeycap.a were installed before
 # making those programs here
 
-LDADD =       -L${.CURDIR}/../keycap -L${.CURDIR}/../keycap/obj -lkeycap
+LDADD =       -L${.CURDIR}/../keycap -L${.OBJDIR}/../keycap -lkeycap
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile
index b26b8eb..53083e0 100644
--- a/usr.sbin/pcvt/vgaio/Makefile
+++ b/usr.sbin/pcvt/vgaio/Makefile
@@ -24,7 +24,7 @@ DPADD=	${LIBM} ${LIBY} ${LIBL}
 LDADD=	-lm -ly -ll
 
 CFLAGS=	-O2	# due to a gcc bug, it compiles only with -O2!
-CFLAGS+= -I${.CURDIR}/obj -I${.CURDIR}
+CFLAGS+= -I${.OBJDIR} -I${.CURDIR}
 
 CLEANFILES+= lex.c lex.yy.c vgaio.c y.tab.[ch]
 CLEANFILES+= y.output	# comment file from bison