mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-29 08:08:37 +00:00
Code Issues Releases Activity

DIRDEPS_BUILD: Fix staging of share/sendmail and share/examples.

Browse Source 
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-03-11 23:45:09 +00:00
parent 4d7ae5ef71
commit d5cc057985
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=296695
8 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/Makefile
View File

@ -3,6 +3,9 @@
.include <src.opts.mk> .include <src.opts.mk>
# No need as it is empty and just causes rebuilds since this file does so much.
UPDATE_DEPENDFILE= no
SUBDIR= \ SUBDIR= \
newsyslog.conf.d newsyslog.conf.d
@ -450,11 +453,16 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
done done
.endif .endif
etc-examples: etc-examples-install:
${META_COOKIE_RM}
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${BIN1} ${BIN2} nsmb.conf opieaccess \ ${BIN1} ${BIN2} nsmb.conf opieaccess \
${DESTDIR}${SHAREDIR}/examples/etc ${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 DESTDIR=${DESTDIR}${SHAREDIR}/examples
.include <bsd.prog.mk> .include <bsd.prog.mk>

1
etc/defaults/Makefile
View File

@ -3,7 +3,6 @@
.include <src.opts.mk> .include <src.opts.mk>
FILES= devfs.rules periodic.conf rc.conf FILES= devfs.rules periodic.conf rc.conf
NO_OBJ=
FILESDIR= /etc/defaults FILESDIR= /etc/defaults
.if ${MK_BLUETOOTH} != "no" .if ${MK_BLUETOOTH} != "no"

11
etc/defaults/Makefile.depend Normal file
View File

@ -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

9
share/examples/Makefile
View File

@ -219,9 +219,11 @@ XFILES+= bhyve/vmrun.sh
SHARED?= copies SHARED?= copies
beforeinstall: ${SHARED} etc-examples beforeinstall: ${SHARED} etc-examples
META_COOKIES+= copies symlinks
.ORDER: ${SHARED} etc-examples .ORDER: ${SHARED} etc-examples
copies: copies:
${META_COOKIE_RM}
.for i in ${LDIRS} .for i in ${LDIRS}
if [ -L ${DESTDIR}${BINDIR}/$i ]; then \ if [ -L ${DESTDIR}${BINDIR}/$i ]; then \
rm -f ${DESTDIR}${BINDIR}/$i; \ rm -f ${DESTDIR}${BINDIR}/$i; \
@ -233,16 +235,19 @@ copies:
${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file} ${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file}
.endfor .endfor
${META_COOKIE_TOUCH}
symlinks: symlinks:
${META_COOKIE_RM}
.for i in ${LDIRS} .for i in ${LDIRS}
rm -rf ${DESTDIR}${BINDIR}/$i rm -rf ${DESTDIR}${BINDIR}/$i
ln -s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i ln -s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i
.endfor .endfor
${META_COOKIE_TOUCH}
etc-examples: etc-examples:
.if ${SHARED} != "symlinks" .if ${SHARED} != "symlinks"
(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples) ${_+_}(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples)
.endif .endif
.if ${SHARED} != "symlinks" .if ${SHARED} != "symlinks"
@ -261,4 +266,4 @@ SUBDIR+=tests
SUBDIR_PARALLEL= SUBDIR_PARALLEL=
.include <bsd.subdir.mk> .include <bsd.prog.mk>

12
share/examples/Makefile.depend Normal file
View File

@ -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

9
share/sendmail/Makefile
View File

@ -16,8 +16,10 @@ SHARED?= copies
all clean cleandir depend lint tags: all clean cleandir depend lint tags:
beforeinstall: ${SHARED} beforeinstall: ${SHARED}
META_COOKIES+= copies symlinks
copies:: copies:
${META_COOKIE_RM}
if [ -L ${DDIR}/${CFDIR} ]; then rm -f ${DDIR}/${CFDIR}; fi if [ -L ${DDIR}/${CFDIR} ]; then rm -f ${DDIR}/${CFDIR}; fi
.for dir in ${CFDIRS} .for dir in ${CFDIRS}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir}
@ -25,8 +27,11 @@ copies::
.for file in ${CFFILES} .for file in ${CFFILES}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file}
.endfor .endfor
${META_COOKIE_TOUCH}
symlinks:: symlinks:
${META_COOKIE_RM}
rm -rf ${DDIR}/${CFDIR}; ln -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR} rm -rf ${DDIR}/${CFDIR}; ln -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR}
${META_COOKIE_TOUCH}
.include <bsd.prog.mk> .include <bsd.prog.mk>

1
share/sendmail/Makefile.depend
View File

@ -2,6 +2,7 @@
# Autogenerated - do NOT edit! # Autogenerated - do NOT edit!
DIRDEPS = \ DIRDEPS = \
usr.bin/xinstall.host \
.include <dirdeps.mk> .include <dirdeps.mk>

1
targets/pseudo/userland/share/Makefile.depend
View File

@ -85,6 +85,7 @@ DIRDEPS = \
share/doc/usd/title \ share/doc/usd/title \
share/dtrace \ share/dtrace \
share/dtrace/toolkit \ share/dtrace/toolkit \
share/examples \
share/examples/atf \ share/examples/atf \
share/examples/ipfilter \ share/examples/ipfilter \
share/examples/pf \ share/examples/pf \