diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index a0b76616b9dc..e86f3721f98f 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,10 +1,11 @@
-#	$NetBSD: Makefile,v 1.7 1996/10/18 05:36:42 thorpej Exp $
+#	$NetBSD: Makefile,v 1.8 1997/02/23 20:42:26 cgd Exp $
 
-.include <bsd.own.mk>			# for ELF_TOOLCHAIN defn on alpha
+.include <bsd.own.mk>			# for ECOFF_TOOLCHAIN defn on alpha
 
 SUBDIR=	${MACHINE_ARCH}
 
-.if (${MACHINE_ARCH} != "alpha" || !defined(ELF_TOOLCHAIN))
+.if (${MACHINE_ARCH} != "alpha" ||
+     (${MACHINE_ARCH} == "alpha" && defined(ECOFF_TOOLCHAIN)))
 SUBDIR+= c++
 .endif
 
diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index 4a21ad2b7e22..93dd0a6d129e 100644
--- a/lib/csu/alpha/Makefile
+++ b/lib/csu/alpha/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.9 1997/02/17 19:22:32 cgd Exp $
+#	$NetBSD: Makefile,v 1.10 1997/02/23 20:42:24 cgd Exp $
 
-.include <bsd.own.mk>			# for ELF_TOOLCHAIN definition
+.include <bsd.own.mk>			# for ECOFF_TOOLCHAIN definition
 
 CFLAGS+=	-DLIBC_SCCS -fPIC -DPIC -DDYNAMIC -DELFSIZE=64
 CFLAGS+=	-I/usr/src/libexec/ld.elf_so
 
-.if !defined(ELF_TOOLCHAIN)
+.if defined(ECOFF_TOOLCHAIN)
 CFLAGS+=	-DECOFF_COMPAT
 .endif
 
diff --git a/libexec/Makefile b/libexec/Makefile
index 6eae9e939ab0..b23a51b49303 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.22 1996/12/18 22:11:09 cgd Exp $
+#	$NetBSD: Makefile,v 1.23 1997/02/23 20:42:27 cgd Exp $
 #	from: @(#)Makefile	5.7 (Berkeley) 4/1/91
 
 .include <bsd.own.mk>			# for EXPORTABLE_SYSTEM
-#					# and ELF_TOOLCHAIN
+#					# and ECOFF_TOOLCHAIN
 
 SUBDIR=	atrun comsat fingerd ftpd getNAME getty identd lfs_cleanerd \
 	mail.local makekey makewhatis rexecd rlogind rshd rpc.rquotad \
@@ -16,7 +16,7 @@ SUBDIR=	atrun comsat fingerd ftpd getNAME getty identd lfs_cleanerd \
 SUBDIR+=telnetd
 .endif
 
-.if ((${MACHINE_ARCH} == "alpha") && defined(ELF_TOOLCHAIN))
+.if (${MACHINE_ARCH} == "alpha" && !defined(ECOFF_TOOLCHAIN))
 SUBDIR+= ld.elf_so
 .endif
 
diff --git a/sys/arch/alpha/stand/Makefile.inc b/sys/arch/alpha/stand/Makefile.inc
index 7b234b5d94e4..12c827aeba66 100644
--- a/sys/arch/alpha/stand/Makefile.inc
+++ b/sys/arch/alpha/stand/Makefile.inc
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile.inc,v 1.6 1997/02/16 21:27:06 cgd Exp $
+#	$NetBSD: Makefile.inc,v 1.7 1997/02/23 20:42:28 cgd Exp $
 
 .ifndef __INCLUDED_STAND_MAKEFILE_INC
 __INCLUDED_STAND_MAKEFILE_INC=
 
-.include <bsd.own.mk>			# for ELF_TOOLCHAIN definition
+.include <bsd.own.mk>			# for ECOFF_TOOLCHAIN definition
 
 BINDIR=			/usr/mdec
 
@@ -20,7 +20,7 @@ CPPFLAGS+=		-DSECONDARY_LOAD_ADDRESS="0x${SECONDARY_LOAD_ADDRESS}"
 
 SAMISCCPPFLAGS+=	-DHEAP_LIMIT="0x${HEAP_LIMIT}"
 
-.if !defined(ELF_TOOLCHAIN)
+.if defined(ECOFF_TOOLCHAIN)
 CPPFLAGS+=	-DECOFF_COMPAT
 .endif