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

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"