Date: Sun, 13 Jun 2010 16:35:20 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r209134 - head/etc Message-ID: <201006131635.o5DGZKpJ085608@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Jun 13 16:35:20 2010 New Revision: 209134 URL: http://svn.freebsd.org/changeset/base/209134 Log: 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. Modified: head/etc/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sun Jun 13 16:27:43 2010 (r209133) +++ head/etc/Makefile Sun Jun 13 16:35:20 2010 (r209134) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006131635.o5DGZKpJ085608>