diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-11 23:45:28 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-11 23:45:28 +0000 |
commit | 88db8d87c1a2bf378fc44e1368317e5e9abc4103 (patch) | |
tree | 37e447dacda2e5ea234551343f02afffa679865c /share/examples/Makefile | |
parent | d586594a01badd7a3134b7081cb2b07ecc8cea6a (diff) | |
download | FreeBSD-src-88db8d87c1a2bf378fc44e1368317e5e9abc4103.zip FreeBSD-src-88db8d87c1a2bf378fc44e1368317e5e9abc4103.tar.gz |
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
Diffstat (limited to 'share/examples/Makefile')
-rw-r--r-- | share/examples/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/share/examples/Makefile b/share/examples/Makefile index 7f243fa..cbc85b0 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" |