From 99cceb7b938fa416f005fc4d7ec39677a7240607 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Sun, 13 Jun 2010 16:35:20 +0000
Subject: [PATCH] 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.
---
 etc/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/etc/Makefile b/etc/Makefile
index 6a2a4d32c65f..f3d4466bda94 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