Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/etc/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/etc/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.309
retrieving revision 1.310
diff -u -p -r1.309 -r1.310
--- src/etc/Makefile	2005/03/24 20:23:55	1.309
+++ src/etc/Makefile	2005/03/25 20:15:20	1.310
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.309 2005/03/24 20:23:55 tron Exp $
+#	$NetBSD: Makefile,v 1.310 2005/03/25 20:15:20 tron Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -340,11 +340,11 @@ OBSOLETE.dir=		${.OBJDIR}/obsolete.dir
 OBSOLETE.files=		base comp etc games man misc text
 .if ${MKX11} != "no"
 OBSOLETE.files+=	xbase xcomp xfont
-.if ${MACHINE_ARCH} == "amd64" ||	\
-    ${MACHINE_ARCH} == "cats" ||	\
-    ${MACHINE_ARCH} == "i386" ||	\
-    ${MACHINE_ARCH} == "macppc" ||	\
-    ${MACHINE_ARCH} == "sgimips"
+.if ${MACHINE} == "amd64" ||	\
+    ${MACHINE} == "cats" ||	\
+    ${MACHINE} == "i386" ||	\
+    ${MACHINE} == "macppc" ||	\
+    ${MACHINE} == "sgimips"
 OBSOLETE.files+=	xserver
 .endif
 .endif