svn commit: r320362 - head/share/zoneinfo

[Sean Bruno]

Hmmm ... This seems to break 'poudriere jail -c jailname -m src=/usr/src
-v head"

--- realinstall_subdir_share/zoneinfo ---
install: builddir/Africa/Abidjan: No such file or directory


On 06/26/17 09:40, Edward Tomasz Napierala wrote:
> Author: trasz
> Date: Mon Jun 26 15:40:24 2017
> New Revision: 320362
> URL: https://svnweb.freebsd.org/changeset/base/320362
> 
> Log:
>   Provide visual feedback when timezone files are installed.
>   After r320003 it wasn't being shown in any way.
>   
>   Submitted by:	bdrewery
>   MFC after:	1 month
>   Differential Revision:	https://reviews.freebsd.org/D11154
> 
> Modified:
>   head/share/zoneinfo/Makefile
> 
> Modified: head/share/zoneinfo/Makefile
> ==============================================================================
> --- head/share/zoneinfo/Makefile	Mon Jun 26 15:23:12 2017	(r320361)
> +++ head/share/zoneinfo/Makefile	Mon Jun 26 15:40:24 2017	(r320362)
> @@ -83,14 +83,19 @@ zoneinfo: yearistype ${TDATA}
>  	zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \
>  	    ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
>  
> +.if make(*install*)
> +TZS!= cd ${TZBUILDDIR} && find -s * -type f
> +.endif
> +
>  beforeinstall: install-zoneinfo
>  install-zoneinfo:
>  	mkdir -p ${DESTDIR}/usr/share/zoneinfo
>  	cd ${DESTDIR}/usr/share/zoneinfo;  mkdir -p ${TZBUILDSUBDIRS}
> -	cd ${TZBUILDDIR} && \
> -	    find -s * -type f -exec ${INSTALL} ${TAG_ARGS} \
> +.for f in ${TZS}
> +	${INSTALL} ${TAG_ARGS} \
>  	    -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
> -	    \{} ${DESTDIR}/usr/share/zoneinfo/\{} \;
> +	    ${TZBUILDDIR:C,^${.OBJDIR}/,,}/${f} ${DESTDIR}/usr/share/zoneinfo/${f}
> +.endfor
>  	${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
>  	    ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
>  
> 
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20170626/a8d25f19/attachment.sig>