summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-06-13 16:35:20 +0000
committerimp <imp@FreeBSD.org>2010-06-13 16:35:20 +0000
commit99cceb7b938fa416f005fc4d7ec39677a7240607 (patch)
treebbf1ec2d783a497b86b60f45f748eea3e2f84a9b /etc
parent98ef42faa8ab64ebb0e40f4ba466f8cad0aaf3d7 (diff)
downloadFreeBSD-src-99cceb7b938fa416f005fc4d7ec39677a7240607.zip
FreeBSD-src-99cceb7b938fa416f005fc4d7ec39677a7240607.tar.gz
Merge from tbemd, with minor tweaks:
Search from most specific ($MACHINE) to least specific ($MACHINE_CPUARCH) when looking for the tty file to use. Also add an .error case if none exist.
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 6a2a4d3..f3d4466 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -22,8 +22,12 @@ BIN1= auth.conf \
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
BIN1+= etc.${MACHINE}/ttys
-.else
+.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
OPENBSMDIR= ${.CURDIR}/../contrib/openbsm
OpenPOWER on IntegriCloud