svn commit: r351055 - head/share/mk

O. Hartmann ohartmann at walstatt.org
Thu Aug 15 05:05:04 UTC 2019


On Wed, 14 Aug 2019 22:33:46 +0000 (UTC)
"Simon J. Gerraty" <sjg at FreeBSD.org> wrote:

> Author: sjg
> Date: Wed Aug 14 22:33:46 2019
> New Revision: 351055
> URL: https://svnweb.freebsd.org/changeset/base/351055
>
> Log:
>   bsd.files.mk: fix targets to avoid directories
>
>   Reintroduce :T when file is used as part of a target name.
>
>   Reviewed by:	stevek
>
> Modified:
>   head/share/mk/bsd.files.mk
>
> Modified: head/share/mk/bsd.files.mk
> ==============================================================================
> --- head/share/mk/bsd.files.mk	Wed Aug 14 22:13:11 2019
> (r351054) +++ head/share/mk/bsd.files.mk	Wed Aug 14 22:33:46
> 2019	(r351055) @@ -101,11 +101,11 @@ STAGE_AS_SETS+=	${file}
>  STAGE_AS_${file}= ${${group}NAME_${file}}
>  # XXX {group}OWN,GRP,MODE
>  STAGE_DIR.${file}= ${STAGE_OBJTOP}${${_${group}DIR_${file}}}
> -stage_as.${file}: ${file}
> +stage_as.${file:T}: ${file}
>
>  installfiles-${group}: _${group}INS1_${file}
> -_${group}INS1_${file}: installdirs-${_${group}DIR_${file}}
> _${group}INS_${file} -_${group}INS_${file}: ${file}
> +_${group}INS1_${file:T}: installdirs-${_${group}DIR_${file}}
> _${group}INS_${file} +_${group}INS_${file:T}: ${file}
>  	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${file}} \
>  	    -g ${${group}GRP_${file}} -m ${${group}MODE_${file}} \
>  	    ${.ALLSRC} ${${group}PREFIX_${file}}/${${group}NAME_${file}}
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"



This commit seems to break "make installworld" by this error during install:

[...]
===> share/doc (install)
===> share/doc/IPv6 (install)
installing DIRS FILESDIR
install  -d -m 0755 -o root  -g wheel  /usr/share/doc/IPv6
install  -o root  -g wheel -m 444  /usr/src/share/doc/IPv6/IMPLEMENTATION
/usr/share/doc/IPv6/IMPLEMENTATION ===> share/doc/legal (install)
===> share/doc/legal/intel_ipw (install)
make[7]: don't know how to make
_FILESINS1_/usr/src/sys/contrib/dev/ipw/LICENSE. Stop

make[7]: stopped in /usr/src/share/doc/legal/intel_ipw
*** Error code 2


More information about the svn-src-head mailing list