--- src/usr.bin/make/Makefile	2005/05/19 17:04:45	1.28
+++ src/usr.bin/make/Makefile	2005/05/19 17:07:17	1.29
@@ -5,7 +5,7 @@
 PROG=	make
 CFLAGS+=-I${.CURDIR}
 SRCS=	arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c	\
-	lst.c main.c make.c parse.c str.c suff.c targ.c util.c var.c
+	lst.c main.c make.c parse.c shell.c str.c suff.c targ.c util.c var.c
 
 WARNS?=	6
 WARNS_WERROR=	YES
@@ -95,11 +95,11 @@ hash:
 
 MAKE_SHELL?=	sh
 .if ${MAKE_SHELL} == "csh"
-CFLAGS+=	-DDEFSHELL=0
+CFLAGS+=	-DDEFSHELLNAME=\"${MAKE_SHELL}\"
 .elif ${MAKE_SHELL} == "sh"
-CFLAGS+=	-DDEFSHELL=1
+CFLAGS+=	-DDEFSHELLNAME=\"${MAKE_SHELL}\"
 .elif ${MAKE_SHELL} == "ksh"
-CFLAGS+=	-DDEFSHELL=2
+CFLAGS+=	-DDEFSHELLNAME=\"${MAKE_SHELL}\"
 .else
 .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
 .endif