aboutsummaryrefslogtreecommitdiff
path: root/share/examples/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 /share/examples/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 'share/examples/Makefile')
-rw-r--r--share/examples/Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 7f243fa35be5..cbc85b067048 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -219,11 +219,10 @@ XFILES+= bhyve/vmrun.sh
SHARED?= copies
beforeinstall: ${SHARED} etc-examples
-META_COOKIES+= copies symlinks
+META_TARGETS+= copies symlinks
.ORDER: ${SHARED} etc-examples
-copies:
- ${META_COOKIE_RM}
+copies: ${META_DEPS}
.for i in ${LDIRS}
if [ -L ${DESTDIR}${BINDIR}/$i ]; then \
rm -f ${DESTDIR}${BINDIR}/$i; \
@@ -235,15 +234,12 @@ copies:
${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file}
.endfor
- ${META_COOKIE_TOUCH}
-symlinks:
- ${META_COOKIE_RM}
+symlinks: ${META_DEPS}
.for i in ${LDIRS}
rm -rf ${DESTDIR}${BINDIR}/$i
ln -s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i
.endfor
- ${META_COOKIE_TOUCH}
etc-examples:
.if ${SHARED} != "symlinks"