svn commit: r320454 - head/share/zoneinfo

[Ngie Cooper (yaneurabeya)]

> On Jun 28, 2017, at 12:05, Cy Schubert <cy at FreeBSD.org> wrote:
> 
> Author: cy
> Date: Wed Jun 28 19:05:04 2017
> New Revision: 320454
> URL: https://svnweb.freebsd.org/changeset/base/320454
> 
> Log:
>  Allow parallel installworld (-j N) and poudriere installworld
>  (poudriere jail -c and poudriere jail -u) to proceed.
> 
>  Reviewed by:	trasz@
>  Tested by:	trasz@, cy@
>  MFC after:	1 month
>  X-MFC-with:	r320362
> 
> Modified:
>  head/share/zoneinfo/Makefile
> 
> Modified: head/share/zoneinfo/Makefile
> ==============================================================================
> --- head/share/zoneinfo/Makefile	Wed Jun 28 17:32:09 2017	(r320453)
> +++ head/share/zoneinfo/Makefile	Wed Jun 28 19:05:04 2017	(r320454)
> @@ -94,7 +94,7 @@ install-zoneinfo:
> .for f in ${TZS}
> 	${INSTALL} ${TAG_ARGS} \
> 	    -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
> -	    ${TZBUILDDIR:C,^${.OBJDIR}/,,}/${f} ${DESTDIR}/usr/share/zoneinfo/${f}
> +	    ${TZBUILDDIR}/${f} ${DESTDIR}/usr/share/zoneinfo/${f}
> .endfor
> 	${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
> 	    ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/

	Thank you for getting this in!
	In general, I would argue that for/.for loops in Make targets are bad like this I think that individual targets could in fact be created, and driven as a dependency of a top-level target, to avoid this issue and keep bdrewery’s intended change in r320362, e.g. something like,

install-zones: .PHONY
.for f in ${TZS}
install-zones: ${DESTDIR}/usr/share/zoneinfo/${f}
${DESTDIR}/usr/share/zoneinfo/${f}: ${f}
	${INSTALL} ...
.endfor

	I’m not incredibly sure based on this commit alone why this Makefile isn’t using FILES though… I’ll look at it closer when I have a spare minute.
Thanks,
-Ngie
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 842 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20170628/a0c5f863/attachment.sig>