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 /etc | |
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 'etc')
-rw-r--r-- | etc/Makefile | 12 | ||||
-rw-r--r-- | etc/defaults/Makefile | 1 | ||||
-rw-r--r-- | etc/defaults/Makefile.depend | 11 |
3 files changed, 21 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile index 27d1ba4..24e0c95 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -3,6 +3,9 @@ .include <src.opts.mk> +# No need as it is empty and just causes rebuilds since this file does so much. +UPDATE_DEPENDFILE= no + SUBDIR= \ newsyslog.conf.d @@ -450,11 +453,16 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY done .endif -etc-examples: +etc-examples-install: + ${META_COOKIE_RM} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}${SHAREDIR}/examples/etc - ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \ + ${META_COOKIE_TOUCH} + +etc-examples: etc-examples-install + ${_+_}cd ${.CURDIR}/defaults; \ + ${MAKE} ${${MK_STAGING} == "yes":?all:install} \ DESTDIR=${DESTDIR}${SHAREDIR}/examples .include <bsd.prog.mk> diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile index 1f6ac5e..4b3a4ce 100644 --- a/etc/defaults/Makefile +++ b/etc/defaults/Makefile @@ -3,7 +3,6 @@ .include <src.opts.mk> FILES= devfs.rules periodic.conf rc.conf -NO_OBJ= FILESDIR= /etc/defaults .if ${MK_BLUETOOTH} != "no" diff --git a/etc/defaults/Makefile.depend b/etc/defaults/Makefile.depend new file mode 100644 index 0000000..f80275d --- /dev/null +++ b/etc/defaults/Makefile.depend @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif |