Instead of including from the wrong directory and then fixing it (-I)

in the Makefile, how about just doing the right include?

usr.bin/make/Makefile

@@ -1,7 +1,6 @@
-#	$NetBSD: Makefile,v 1.31 2004/02/15 19:05:45 sjg Exp $
+#	$NetBSD: Makefile,v 1.32 2004/05/06 23:15:46 ross Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 
-CPPFLAGS+= -I${.CURDIR}
 PROG=	make
 SRCS=	arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
 	make.c parse.c str.c suff.c targ.c trace.c var.c util.c 

usr.bin/make/Makefile.boot

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.boot,v 1.15 2002/06/11 06:06:19 itojun Exp $
+#	$NetBSD: Makefile.boot,v 1.16 2004/05/06 23:15:46 ross Exp $
 #
 # a very simple makefile...
 #
@@ -16,8 +16,7 @@ MACHINE_ARCH=i386
 # tested on HP-UX 10.20
 #MAKE_MACHINE=hp700
 #MAKE_MACHINE_ARCH=hppa
-CFLAGS= -I.\
-	-DTARGET_MACHINE=\"${MACHINE}\" \
+CFLAGS= -DTARGET_MACHINE=\"${MACHINE}\" \
 	-DTARGET_MACHINE_ARCH=\"${MACHINE_ARCH}\" \
 	-DMAKE_MACHINE=\"${MACHINE}\" \
 	-DMAKE_BOOTSTRAP

usr.bin/make/lst.lib/lstInt.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: lstInt.h,v 1.9 2003/08/07 11:15:06 agc Exp $	*/
+/*	$NetBSD: lstInt.h,v 1.10 2004/05/06 23:15:46 ross Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -41,8 +41,8 @@
 #ifndef _LSTINT_H_
 #define _LSTINT_H_
 
-#include	  "make.h"
-#include	  "lst.h"
+#include	  "../make.h"
+#include	  "../lst.h"
 
 typedef struct ListNode {
 	struct ListNode	*prevPtr;   /* previous element in list */