diff options
author | eadler <eadler@FreeBSD.org> | 2012-02-09 20:44:20 +0000 |
---|---|---|
committer | eadler <eadler@FreeBSD.org> | 2012-02-09 20:44:20 +0000 |
commit | afb7bb20cb3b86b1d92307b78f8dc5bc64f0425a (patch) | |
tree | b468c36cce4cf75d79227c437634fc2da6f7ed8b /etc | |
parent | 14d7e96f92fb7864a91f37d8926e681822a4bf99 (diff) | |
download | FreeBSD-src-afb7bb20cb3b86b1d92307b78f8dc5bc64f0425a.zip FreeBSD-src-afb7bb20cb3b86b1d92307b78f8dc5bc64f0425a.tar.gz |
Make etc/Makefile more conflict resistant
PR: conf/163789
Submitted by: gcooper (iXsystems)
Approved by: cperciva
MFC after: 3 days
Diffstat (limited to 'etc')
-rw-r--r-- | etc/Makefile | 54 |
1 files changed, 42 insertions, 12 deletions
diff --git a/etc/Makefile b/etc/Makefile index 42d6959..0df9ec7 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -7,18 +7,48 @@ SUBDIR= sendmail .endif -BIN1= auth.conf \ - crontab devd.conf devfs.conf \ - ddb.conf dhclient.conf disktab fbtab \ - ftpusers gettytab group \ - hosts hosts.allow hosts.equiv \ - inetd.conf libalias.conf login.access login.conf mac.conf motd \ - netconfig network.subr networks newsyslog.conf nsswitch.conf \ - phones profile protocols \ - rc rc.bsdextended rc.firewall rc.initdiskless \ - rc.sendmail rc.shutdown \ - rc.subr remote rpc services shells \ - sysctl.conf syslog.conf termcap.small +BIN1= auth.conf +BIN1+= crontab +BIN1+= devd.conf +BIN1+= devfs.conf +BIN1+= ddb.conf +BIN1+= dhclient.conf +BIN1+= disktab +BIN1+= fbtab +BIN1+= ftpusers +BIN1+= gettytab +BIN1+= group +BIN1+= hosts +BIN1+= hosts.allow +BIN1+= hosts.equiv +BIN1+= inetd.conf +BIN1+= libalias.conf +BIN1+= login.access +BIN1+= login.conf +BIN1+= mac.conf +BIN1+= motd +BIN1+= netconfig +BIN1+= network.subr +BIN1+= networks +BIN1+= newsyslog.conf +BIN1+= nsswitch.conf +BIN1+= phones +BIN1+= profile +BIN1+= protocols +BIN1+= rc +BIN1+= rc.bsdextended +BIN1+= rc.firewall +BIN1+= rc.initdiskless +BIN1+= rc.sendmail +BIN1+= rc.shutdown +BIN1+= rc.subr +BIN1+= remote +BIN1+= rpc +BIN1+= services +BIN1+= shells +BIN1+= sysctl.conf +BIN1+= syslog.conf +BIN1+= termcap.small .if exists(${.CURDIR}/etc.${MACHINE}/ttys) BIN1+= etc.${MACHINE}/ttys |