diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-11 23:45:20 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-11 23:45:20 +0000 |
| commit | a295004d11d1c81794f9a6436917f85f93d2b60f (patch) | |
| tree | a39e0ece31f8cbee49d38b23df69486edf2f4d15 | |
| parent | 4ce2f6cba1b025ba3d1d9dd3172f984ee353507f (diff) | |
| download | FreeBSD-src-a295004d11d1c81794f9a6436917f85f93d2b60f.zip FreeBSD-src-a295004d11d1c81794f9a6436917f85f93d2b60f.tar.gz | |
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
| -rw-r--r-- | share/zoneinfo/Makefile | 11 | ||||
| -rw-r--r-- | share/zoneinfo/Makefile.depend | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 8969da4..6f40843 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -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: # diff --git a/share/zoneinfo/Makefile.depend b/share/zoneinfo/Makefile.depend index f80275d..d7cfba0 100644 --- a/share/zoneinfo/Makefile.depend +++ b/share/zoneinfo/Makefile.depend @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + usr.bin/xinstall.host \ .include <dirdeps.mk> |
