diff options
author | Renato Botelho <renato@netgate.com> | 2016-01-14 09:33:16 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-01-14 09:33:16 -0200 |
commit | 58b7eab7d39d983cc70f6f1d611f00470a76fca1 (patch) | |
tree | bb36653da0e7ff3eb5ec994f6923513a77973ba0 /etc | |
parent | 3e0bf52f358eb969d165c4b1e54942ee94cf2c8d (diff) | |
parent | e9becf4ed022809a585e21a1d3da8a3a233ff648 (diff) | |
download | FreeBSD-src-58b7eab7d39d983cc70f6f1d611f00470a76fca1.zip FreeBSD-src-58b7eab7d39d983cc70f6f1d611f00470a76fca1.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'etc')
-rw-r--r-- | etc/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/Makefile b/etc/Makefile index c50014d..1030f5f 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -86,10 +86,6 @@ BIN1+= apmd.conf BIN1+= auto_master .endif -.if ${MK_BSNMP} != "no" -BIN1+= snmpd.config -.endif - .if ${MK_FREEBSD_UPDATE} != "no" BIN1+= freebsd-update.conf .endif @@ -218,6 +214,11 @@ distribution: ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; +.if ${MK_BSNMP} != "no" + cd ${.CURDIR}; \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ + snmpd.config ${DESTDIR}/etc; +.endif .if ${MK_AT} == "no" sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab .endif |