Move etc/ttys to sbin/init/.

And simplify this a little by flattening the directory structure.

Approved by:	re (gjb), will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16955
This commit is contained in:
brd 2018-09-04 15:48:13 +00:00
parent 38e9280258
commit d52ccf250f
10 changed files with 12 additions and 11 deletions

View File

@ -35,16 +35,6 @@ BIN1= crontab \
rpc \
termcap.small
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
BIN1+= etc.${MACHINE}/ttys
.elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys)
BIN1+= etc.${MACHINE_ARCH}/ttys
.elif exists(${.CURDIR}/etc.${MACHINE_CPUARCH}/ttys)
BIN1+= etc.${MACHINE_CPUARCH}/ttys
.else
.error etc.MACHINE/ttys missing
.endif
# NB: keep these sorted by MK_* knobs
.if ${MK_AMD} != "no"

View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
CONFGROUPS= CONFETC CONFETCEXEC CONFETCDEFAULTS
CONFGROUPS= CONFETC CONFETCEXEC CONFETCDEFAULTS CONFTTYS
CONFETCDIR= /etc
CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown
CONFETCMODE= 644
@ -19,6 +19,17 @@ INSTALLFLAGS=-b -B.bak
CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
LIBADD= util crypt
CONFTTYSNAME= ttys
.if exists(${.CURDIR}/ttys.${MACHINE})
CONFTTYS+= ttys.${MACHINE}
.elif exists(${.CURDIR}/ttys.${MACHINE_ARCH})
CONFTTYS+= ttys.${MACHINE_ARCH}
.elif exists(${.CURDIR}/ttys.${MACHINE_CPUARCH})
CONFTTYS+= ttys.${MACHINE_CPUARCH}
.else
.error MACHINE.ttys missing
.endif
# Needed for getmntopts.c
MOUNT= ${SRCTOP}/sbin/mount
CFLAGS+=-I${MOUNT}