From owner-svn-src-head@FreeBSD.ORG  Fri Nov 13 18:31:08 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A5ED5106568B;
	Fri, 13 Nov 2009 18:31:08 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 408E18FC1D;
	Fri, 13 Nov 2009 18:31:08 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id nADIOFLw078111;
	Fri, 13 Nov 2009 11:24:15 -0700 (MST) (envelope-from imp@bsdimp.com)
Date: Fri, 13 Nov 2009 11:24:15 -0700 (MST)
Message-Id: <20091113.112415.41705849.imp@bsdimp.com>
To: ed@FreeBSD.org
From: Warner Losh <imp@bsdimp.com>
In-Reply-To: <200911131126.nADBQiji064699@svn.freebsd.org>
References: <200911131126.nADBQiji064699@svn.freebsd.org>
X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r199249 - in head/etc: . etc.pc98
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Nov 2009 18:31:08 -0000

> -	sysctl.conf syslog.conf \
> -	etc.${MACHINE_ARCH}/ttys
> +	sysctl.conf syslog.conf
> +
> +.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
> +BIN1+=	etc.${MACHINE}/ttys
> +.else
> +BIN1+=	etc.${MACHINE_ARCH}/ttys
> +.endif

I'd go all the way here and make this be ${MACHINE} unconditionally.

Warner