aboutsummaryrefslogtreecommitdiff
path: root/etc/Makefile
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-03-11 23:45:28 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-03-11 23:45:28 +0000
commitb7d28aff1009ed31d870976928b60328bf585d07 (patch)
tree37e447dacda2e5ea234551343f02afffa679865c /etc/Makefile
parentbd08afe1c93546441a7b2a7a366579959f098940 (diff)
downloadsrc-b7d28aff1009ed31d870976928b60328bf585d07.tar.gz
src-b7d28aff1009ed31d870976928b60328bf585d07.zip
META_MODE: Simplify the META_COOKIE handling to use .USE/.USEBEFORE.
Extend it to other cases of meta mode cookies so they get the proper rm cookie behavior when a .meta file detects it needs to rebuild and fails. Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=296700
Diffstat (limited to 'etc/Makefile')
-rw-r--r--etc/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 24e0c950fbfd..cb91c23e07a5 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -453,12 +453,10 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
done
.endif
-etc-examples-install:
- ${META_COOKIE_RM}
+etc-examples-install: ${META_DEPS}
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${BIN1} ${BIN2} nsmb.conf opieaccess \
${DESTDIR}${SHAREDIR}/examples/etc
- ${META_COOKIE_TOUCH}
etc-examples: etc-examples-install
${_+_}cd ${.CURDIR}/defaults; \