diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-11 23:45:09 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-11 23:45:09 +0000 |
commit | 946eac8da84e5763b65b0f91465b545188f630ee (patch) | |
tree | 4e5100019da5a280cc182d0139aa8759b1ae1a69 /share/examples | |
parent | 076eeb23035d1dc687a6d4cc03dc05e7f278791a (diff) | |
download | FreeBSD-src-946eac8da84e5763b65b0f91465b545188f630ee.zip FreeBSD-src-946eac8da84e5763b65b0f91465b545188f630ee.tar.gz |
DIRDEPS_BUILD: Fix staging of share/sendmail and share/examples.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share/examples')
-rw-r--r-- | share/examples/Makefile | 9 | ||||
-rw-r--r-- | share/examples/Makefile.depend | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/share/examples/Makefile b/share/examples/Makefile index 2484aff..7f243fa 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -219,9 +219,11 @@ XFILES+= bhyve/vmrun.sh SHARED?= copies beforeinstall: ${SHARED} etc-examples +META_COOKIES+= copies symlinks .ORDER: ${SHARED} etc-examples copies: + ${META_COOKIE_RM} .for i in ${LDIRS} if [ -L ${DESTDIR}${BINDIR}/$i ]; then \ rm -f ${DESTDIR}${BINDIR}/$i; \ @@ -233,16 +235,19 @@ copies: ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ ${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file} .endfor + ${META_COOKIE_TOUCH} symlinks: + ${META_COOKIE_RM} .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" - (cd ${.CURDIR}/../../etc; ${MAKE} etc-examples) + ${_+_}(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples) .endif .if ${SHARED} != "symlinks" @@ -261,4 +266,4 @@ SUBDIR+=tests SUBDIR_PARALLEL= -.include <bsd.subdir.mk> +.include <bsd.prog.mk> diff --git a/share/examples/Makefile.depend b/share/examples/Makefile.depend new file mode 100644 index 0000000..d7cfba0 --- /dev/null +++ b/share/examples/Makefile.depend @@ -0,0 +1,12 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + usr.bin/xinstall.host \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif |