Author: bdrewery
Date: Fri Mar 11 23:45:09 2016
New Revision: 296695
URL: https://svnweb.freebsd.org/changeset/base/296695
Log:
DIRDEPS_BUILD: Fix staging of share/sendmail and share/examples.
Sponsored by: EMC / Isilon Storage Division
Added:
head/etc/defaults/Makefile.depend
- copied, changed from r296694, head/share/sendmail/Makefile.depend
head/share/examples/Makefile.depend
- copied, changed from r296694, head/share/sendmail/Makefile.depend
Modified:
head/etc/Makefile
head/etc/defaults/Makefile
head/share/examples/Makefile
head/share/sendmail/Makefile
head/share/sendmail/Makefile.depend
head/targets/pseudo/userland/share/Makefile.depend
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Fri Mar 11 23:45:05 2016 (r296694)
+++ head/etc/Makefile Fri Mar 11 23:45:09 2016 (r296695)
@@ -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-clea
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>
Modified: head/etc/defaults/Makefile
==============================================================================
--- head/etc/defaults/Makefile Fri Mar 11 23:45:05 2016 (r296694)
+++ head/etc/defaults/Makefile Fri Mar 11 23:45:09 2016 (r296695)
@@ -3,7 +3,6 @@
.include <src.opts.mk>
FILES= devfs.rules periodic.conf rc.conf
-NO_OBJ=
FILESDIR= /etc/defaults
.if ${MK_BLUETOOTH} != "no"
Copied and modified: head/etc/defaults/Makefile.depend (from r296694,
head/share/sendmail/Makefile.depend)
==============================================================================
Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile Fri Mar 11 23:45:05 2016
(r296694)
+++ head/share/examples/Makefile Fri Mar 11 23:45:09 2016
(r296695)
@@ -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>
Copied and modified: head/share/examples/Makefile.depend (from r296694,
head/share/sendmail/Makefile.depend)
==============================================================================
--- head/share/sendmail/Makefile.depend Fri Mar 11 23:45:05 2016
(r296694, copy source)
+++ head/share/examples/Makefile.depend Fri Mar 11 23:45:09 2016
(r296695)
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
Modified: head/share/sendmail/Makefile
==============================================================================
--- head/share/sendmail/Makefile Fri Mar 11 23:45:05 2016
(r296694)
+++ head/share/sendmail/Makefile Fri Mar 11 23:45:09 2016
(r296695)
@@ -16,8 +16,10 @@ SHARED?= copies
all clean cleandir depend lint tags:
beforeinstall: ${SHARED}
+META_COOKIES+= copies symlinks
-copies::
+copies:
+ ${META_COOKIE_RM}
if [ -L ${DDIR}/${CFDIR} ]; then rm -f ${DDIR}/${CFDIR}; fi
.for dir in ${CFDIRS}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir}
@@ -25,8 +27,11 @@ copies::
.for file in ${CFFILES}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file}
${DDIR}/${file}
.endfor
+ ${META_COOKIE_TOUCH}
-symlinks::
+symlinks:
+ ${META_COOKIE_RM}
rm -rf ${DDIR}/${CFDIR}; ln -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR}
+ ${META_COOKIE_TOUCH}
.include <bsd.prog.mk>
Modified: head/share/sendmail/Makefile.depend
==============================================================================
--- head/share/sendmail/Makefile.depend Fri Mar 11 23:45:05 2016
(r296694)
+++ head/share/sendmail/Makefile.depend Fri Mar 11 23:45:09 2016
(r296695)
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
Modified: head/targets/pseudo/userland/share/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/share/Makefile.depend Fri Mar 11 23:45:05
2016 (r296694)
+++ head/targets/pseudo/userland/share/Makefile.depend Fri Mar 11 23:45:09
2016 (r296695)
@@ -85,6 +85,7 @@ DIRDEPS = \
share/doc/usd/title \
share/dtrace \
share/dtrace/toolkit \
+ share/examples \
share/examples/atf \
share/examples/ipfilter \
share/examples/pf \
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
