Author: bdrewery
Date: Fri Mar 11 23:45:20 2016
New Revision: 296698
URL: https://svnweb.freebsd.org/changeset/base/296698
Log:
DIRDEPS_BUILD: Reduce restaging here.
This also fixes meta tracking for the beforeinstall since it had been
marked .PHONY before (in bsd.sys.mk).
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/zoneinfo/Makefile
head/share/zoneinfo/Makefile.depend
Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile Fri Mar 11 23:45:17 2016
(r296697)
+++ head/share/zoneinfo/Makefile Fri Mar 11 23:45:20 2016
(r296698)
@@ -70,22 +70,27 @@ TZBUILDSUBDIRS= \
.if !defined(_SKIP_BUILD)
all: zoneinfo
.endif
+META_COOKIES+= zoneinfo install-zoneinfo
-.PHONY: zoneinfo
-zoneinfo: yearistype ${TDATA}
+zoneinfo: yearistype ${TDATA} ${META_NOPHONY}
+ ${META_COOKIE_RM}
mkdir -p ${TZBUILDDIR}
cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS}
umask 022; cd ${.CURDIR}; \
zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \
${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
+ ${META_COOKIE_TOUCH}
-beforeinstall:
+beforeinstall: install-zoneinfo
+install-zoneinfo: ${META_NOPHONY}
+ ${META_COOKIE_RM}
cd ${TZBUILDDIR} && \
find -s * -type f -print -exec ${INSTALL} \
-o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
\{} ${DESTDIR}/usr/share/zoneinfo/\{} \;
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
+ ${META_COOKIE_TOUCH}
afterinstall:
#
Modified: head/share/zoneinfo/Makefile.depend
==============================================================================
--- head/share/zoneinfo/Makefile.depend Fri Mar 11 23:45:17 2016
(r296697)
+++ head/share/zoneinfo/Makefile.depend Fri Mar 11 23:45:20 2016
(r296698)
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
