From 1e127d86d11bfe39d74226d9e4a4c3cd2bdc5e6c Mon Sep 17 00:00:00 2001 From: jdolecek Date: Tue, 17 Dec 2002 15:54:59 +0000 Subject: [PATCH] ttyaction is ${MACHINE}-specific, not per ${MACHINE_ARCH} remove special ttyaction hook from etc/etc.sun[23]/Makefile.inc, it's no longer needed ld.so.conf is ${MACHINE}-specific, the code happened to work for i386 and sparc only because ${MACHINE} == ${MACHINE_ARCH} there remove basesrc/etc/ld.so.conf and its special vax/ns32k/m68k hook in Makefile - vax & m68k are ELF now, and ns32k doesn't need to be handled here --- distrib/sets/lists/etc/md.amiga | 2 -- distrib/sets/lists/etc/md.atari | 2 -- distrib/sets/lists/etc/md.hp300 | 2 -- distrib/sets/lists/etc/md.luna68k | 2 -- distrib/sets/lists/etc/md.mac68k | 2 -- distrib/sets/lists/etc/md.mvme68k | 2 -- distrib/sets/lists/etc/md.news68k | 2 -- distrib/sets/lists/etc/md.next68k | 2 -- distrib/sets/lists/etc/md.pc532 | 2 -- distrib/sets/lists/etc/md.sun2 | 3 +-- distrib/sets/lists/etc/md.sun3 | 3 +-- distrib/sets/lists/etc/md.vax | 2 -- distrib/sets/lists/etc/md.x68k | 2 -- etc/Makefile | 14 +++++--------- etc/etc.sun2/Makefile.inc | 4 +--- etc/etc.sun3/Makefile.inc | 4 +--- etc/ld.so.conf | 1 - 17 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 distrib/sets/lists/etc/md.amiga delete mode 100644 distrib/sets/lists/etc/md.atari delete mode 100644 distrib/sets/lists/etc/md.hp300 delete mode 100644 distrib/sets/lists/etc/md.luna68k delete mode 100644 distrib/sets/lists/etc/md.mac68k delete mode 100644 distrib/sets/lists/etc/md.mvme68k delete mode 100644 distrib/sets/lists/etc/md.news68k delete mode 100644 distrib/sets/lists/etc/md.next68k delete mode 100644 distrib/sets/lists/etc/md.pc532 delete mode 100644 distrib/sets/lists/etc/md.vax delete mode 100644 distrib/sets/lists/etc/md.x68k delete mode 100644 etc/ld.so.conf diff --git a/distrib/sets/lists/etc/md.amiga b/distrib/sets/lists/etc/md.amiga deleted file mode 100644 index 9c487fc67b41..000000000000 --- a/distrib/sets/lists/etc/md.amiga +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.amiga,v 1.5 2002/05/04 19:44:27 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.atari b/distrib/sets/lists/etc/md.atari deleted file mode 100644 index 95f54096af70..000000000000 --- a/distrib/sets/lists/etc/md.atari +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.atari,v 1.5 2002/05/04 19:44:27 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.hp300 b/distrib/sets/lists/etc/md.hp300 deleted file mode 100644 index 3bb7a99766ea..000000000000 --- a/distrib/sets/lists/etc/md.hp300 +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.hp300,v 1.5 2002/05/04 19:44:28 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.luna68k b/distrib/sets/lists/etc/md.luna68k deleted file mode 100644 index 4b50e841c8be..000000000000 --- a/distrib/sets/lists/etc/md.luna68k +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.luna68k,v 1.3 2002/05/04 19:44:29 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.mac68k b/distrib/sets/lists/etc/md.mac68k deleted file mode 100644 index 08538de5ff21..000000000000 --- a/distrib/sets/lists/etc/md.mac68k +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.mac68k,v 1.5 2002/05/04 19:44:29 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.mvme68k b/distrib/sets/lists/etc/md.mvme68k deleted file mode 100644 index 9f52c29a5772..000000000000 --- a/distrib/sets/lists/etc/md.mvme68k +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.mvme68k,v 1.6 2002/05/04 19:44:30 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.news68k b/distrib/sets/lists/etc/md.news68k deleted file mode 100644 index d5dc6e8cbdf5..000000000000 --- a/distrib/sets/lists/etc/md.news68k +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.news68k,v 1.3 2002/05/04 19:44:31 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.next68k b/distrib/sets/lists/etc/md.next68k deleted file mode 100644 index 5b28be14ff4a..000000000000 --- a/distrib/sets/lists/etc/md.next68k +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.next68k,v 1.5 2002/05/04 19:44:31 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.pc532 b/distrib/sets/lists/etc/md.pc532 deleted file mode 100644 index b7fd4f8b7852..000000000000 --- a/distrib/sets/lists/etc/md.pc532 +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.pc532,v 1.5 2002/05/04 19:44:31 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.sun2 b/distrib/sets/lists/etc/md.sun2 index 6578c1577a01..4c992a6f1619 100644 --- a/distrib/sets/lists/etc/md.sun2 +++ b/distrib/sets/lists/etc/md.sun2 @@ -1,3 +1,2 @@ -# $NetBSD: md.sun2,v 1.2 2002/05/04 19:44:33 jdolecek Exp $ -#./etc/ld.so.conf etc-sys-etc +# $NetBSD: md.sun2,v 1.3 2002/12/17 15:55:05 jdolecek Exp $ ./etc/ttyaction etc-sys-etc diff --git a/distrib/sets/lists/etc/md.sun3 b/distrib/sets/lists/etc/md.sun3 index 6e239a1c2b6e..93843b691c19 100644 --- a/distrib/sets/lists/etc/md.sun3 +++ b/distrib/sets/lists/etc/md.sun3 @@ -1,3 +1,2 @@ -# $NetBSD: md.sun3,v 1.8 2002/05/04 19:44:33 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc +# $NetBSD: md.sun3,v 1.9 2002/12/17 15:55:06 jdolecek Exp $ ./etc/ttyaction etc-sys-etc diff --git a/distrib/sets/lists/etc/md.vax b/distrib/sets/lists/etc/md.vax deleted file mode 100644 index a2a4ad360855..000000000000 --- a/distrib/sets/lists/etc/md.vax +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.vax,v 1.6 2002/05/04 19:44:34 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/distrib/sets/lists/etc/md.x68k b/distrib/sets/lists/etc/md.x68k deleted file mode 100644 index fd0ba72f0e93..000000000000 --- a/distrib/sets/lists/etc/md.x68k +++ /dev/null @@ -1,2 +0,0 @@ -# $NetBSD: md.x68k,v 1.5 2002/05/04 19:44:34 jdolecek Exp $ -./etc/ld.so.conf etc-sys-etc diff --git a/etc/Makefile b/etc/Makefile index 09392704673d..d5fc7525bca0 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.233 2002/12/02 13:18:03 lukem Exp $ +# $NetBSD: Makefile,v 1.234 2002/12/17 15:54:59 jdolecek Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -91,16 +91,12 @@ BIN1+= bootptab changelist csh.cshrc csh.login csh.logout daily \ weekly weekly.conf wscons.conf \ etc.${MACHINE}/ttys etc.${MACHINE}/disktab -.if (${MACHINE_ARCH} == "m68k") || \ - (${MACHINE_ARCH} == "ns32k") || \ - (${MACHINE_ARCH} == "vax") -BIN1+= ld.so.conf -.elif exists(etc.${MACHINE_ARCH}/ld.so.conf) -BIN1+= etc.${MACHINE_ARCH}/ld.so.conf +.if exists(etc.${MACHINE}/ld.so.conf) +BIN1+= etc.${MACHINE}/ld.so.conf .endif -.if exists(etc.${MACHINE_ARCH}/ttyaction) -BIN1+= etc.${MACHINE_ARCH}/ttyaction +.if exists(etc.${MACHINE}/ttyaction) +BIN1+= etc.${MACHINE}/ttyaction .endif # -rw-rw-r-- diff --git a/etc/etc.sun2/Makefile.inc b/etc/etc.sun2/Makefile.inc index f02f99e2c30c..47873528fb89 100644 --- a/etc/etc.sun2/Makefile.inc +++ b/etc/etc.sun2/Makefile.inc @@ -1,10 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.5 2002/12/02 13:31:22 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.6 2002/12/17 15:55:01 jdolecek Exp $ # # etc.sun2/Makefile.inc -- sun2-specific etc Makefile targets # -BIN3+= etc.sun2/ttyaction - KERNEL_SETS= GENERIC FOURMEG DISKLESS EXTRA_KERNELS= INSTALL diff --git a/etc/etc.sun3/Makefile.inc b/etc/etc.sun3/Makefile.inc index ed9ed3b44a7b..fe96bae1698d 100644 --- a/etc/etc.sun3/Makefile.inc +++ b/etc/etc.sun3/Makefile.inc @@ -1,10 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.15 2002/12/02 13:31:23 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.16 2002/12/17 15:55:01 jdolecek Exp $ # # etc.sun3/Makefile.inc -- sun3-specific etc Makefile targets # -BIN3+= etc.sun3/ttyaction - KERNEL_SETS= GENERIC GENERIC3X DISKLESS DISKLESS3X EXTRA_KERNELS= INSTALL INSTALL3X diff --git a/etc/ld.so.conf b/etc/ld.so.conf deleted file mode 100644 index e8e4bdcd42ed..000000000000 --- a/etc/ld.so.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/local/lib