diff options
author | dim <dim@FreeBSD.org> | 2015-02-04 21:08:28 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-02-04 21:08:28 +0000 |
commit | bd558a3f75de913bd9b0752eb936f1ce14a5e117 (patch) | |
tree | 3457af88155d97a5bbe80a8197330c4d25104efc /etc | |
parent | f27eb4094eed573ec678dc4931cbc2917faccf68 (diff) | |
parent | 7984b94dab1c2e20c98edd0089b674cb68e91084 (diff) | |
download | FreeBSD-src-bd558a3f75de913bd9b0752eb936f1ce14a5e117.zip FreeBSD-src-bd558a3f75de913bd9b0752eb936f1ce14a5e117.tar.gz |
Merge ^/head r278110 through r278223.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/etc/Makefile b/etc/Makefile index b27542a..4a13abe 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -21,13 +21,11 @@ BIN1= crontab \ dhclient.conf \ disktab \ fbtab \ - ftpusers \ gettytab \ group \ hosts \ hosts.allow \ hosts.equiv \ - inetd.conf \ libalias.conf \ libmap.conf \ login.access \ @@ -101,6 +99,14 @@ BIN1+= snmpd.config BIN1+= freebsd-update.conf .endif +.if ${MK_FTP} != "no" +BIN1+= ftpusers +.endif + +.if ${MK_INETD} != "no" +BIN1+= inetd.conf +.endif + .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif |