svn commit: r320454 - head/share/zoneinfo

[Cy Schubert]

In message <3305BCF7-0978-4152-B3AD-309FD891B59D at gmail.com>, "Ngie Cooper 
(yane
urabeya)" writes:
> 
> 
> --Apple-Mail=_08D0994E-C5E0-4E84-ACF1-C103E9A01AF3
> Content-Transfer-Encoding: quoted-printable
> Content-Type: text/plain;
> 	charset=utf-8
> 
> 
> > On Jun 28, 2017, at 12:05, Cy Schubert <cy at FreeBSD.org> wrote:
> >=20
> > Author: cy
> > Date: Wed Jun 28 19:05:04 2017
> > New Revision: 320454
> > URL: https://svnweb.freebsd.org/changeset/base/320454
> >=20
> > Log:
> >  Allow parallel installworld (-j N) and poudriere installworld
> >  (poudriere jail -c and poudriere jail -u) to proceed.
> >=20
> >  Reviewed by:	trasz@
> >  Tested by:	trasz@, cy@
> >  MFC after:	1 month
> >  X-MFC-with:	r320362
> >=20
> > Modified:
> >  head/share/zoneinfo/Makefile
> >=20
> > Modified: head/share/zoneinfo/Makefile
> > =
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D
> > --- 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!

No problem.

> 	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=E2=80=99s 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

This is definitely cleaner.

Having said that, the problem wasn't caused by the loop itself but the edit 
of path.

> 
> 	I=E2=80=99m not incredibly sure based on this commit alone why =
> this Makefile isn=E2=80=99t using FILES though=E2=80=A6 I=E2=80=99ll =
> look at it closer when I have a spare minute.

Good idea.


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.