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
This commit is contained in:
parent
beff0dd387
commit
1e127d86d1
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
@ -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
|
14
etc/Makefile
14
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--
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1 +0,0 @@
|
||||
/usr/local/lib
|
Loading…
Reference in New Issue
Block a user