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

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

details:   https://anonhg.NetBSD.org/src/rev/868bd48ed85e
branches:  netbsd-3
changeset: 575255:868bd48ed85e
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 22:20:04 2005 +0000

description:
Pull up revision 1.309 (requested by jmc in ticket #114):
Checking for the file "xserver" in "${OBSOLETE.dir}" doesn't work because
the check will be done before the target which is used to create that file.
So simply add "xserver" to "${OBSOLETE.file}" based on the architecture.

diffstat:

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

diffs (30 lines):

diff -r 19292016ebbf -r 868bd48ed85e etc/Makefile
--- a/etc/Makefile      Wed Apr 06 22:18:34 2005 +0000
+++ b/etc/Makefile      Wed Apr 06 22:20:04 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.306.2.2 2005/04/06 22:16:02 tron Exp $
+#      $NetBSD: Makefile,v 1.306.2.3 2005/04/06 22:20:04 tron Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -340,8 +340,11 @@
 OBSOLETE.files=                base comp etc games man misc text
 .if ${MKX11} != "no"
 OBSOLETE.files+=       xbase xcomp xfont
-.if exists(${OBSOLETE.dir}/xserver)
-# not all archs have obsolete files for the xserver set
+.if ${MACHINE_ARCH} == "amd64" ||      \
+    ${MACHINE_ARCH} == "cats" ||       \
+    ${MACHINE_ARCH} == "i386" ||       \
+    ${MACHINE_ARCH} == "macppc" ||     \
+    ${MACHINE_ARCH} == "sgimips"
 OBSOLETE.files+=       xserver
 .endif
 .endif
@@ -616,3 +619,6 @@
        -rm -rf ${CDROM.dir} ${CDROM.pathlist} ${OBSOLETE.dir}
 
 .include <bsd.prog.mk>
+
+test:
+       @echo ${OBSOLETE.files}