[src/netbsd-3]: src/etc Pull up revision 1.310 (requested by jmc in ticket #1...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2be7573fc615
branches:  netbsd-3
changeset: 575257:2be7573fc615
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 22:21:00 2005 +0000

description:
Pull up revision 1.310 (requested by jmc in ticket #114):
We must check for "${MACHINE}" and not "${MACHINE_ARCH}" of course to
decide about port specific obsolete lists.

diffstat:

 etc/Makefile |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (26 lines):

diff -r 58421a5d03a3 -r 2be7573fc615 etc/Makefile
--- a/etc/Makefile      Wed Apr 06 22:20:31 2005 +0000
+++ b/etc/Makefile      Wed Apr 06 22:21:00 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.306.2.3 2005/04/06 22:20:04 tron Exp $
+#      $NetBSD: Makefile,v 1.306.2.4 2005/04/06 22:21:00 tron Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -340,11 +340,11 @@
 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