svn commit: r51065 - head/share/mk

[Mathieu Arnold]

Le 06/10/2017 à 12:44, Wolfram Schneider a écrit :
> Author: wosch
> Date: Fri Oct  6 10:44:00 2017
> New Revision: 51065
> URL: https://svnweb.freebsd.org/changeset/doc/51065
>
> Log:
>   'make obj' doesn't really work for the docs, disable it by default
>   
>       PR: 222488


It does if you run:

make obj && make objlink && make <whatever you want>

now I have to carry a local patch that arcanist keeps complaining about :(

> Modified:
>   head/share/mk/doc.project.mk
>   head/share/mk/web.site.mk
>
> Modified: head/share/mk/doc.project.mk
> ==============================================================================
> --- head/share/mk/doc.project.mk	Fri Oct  6 09:36:06 2017	(r51064)
> +++ head/share/mk/doc.project.mk	Fri Oct  6 10:44:00 2017	(r51065)
> @@ -57,6 +57,9 @@
>  #			Currently the only method.
>  #
>  
> +# 'make obj' doesn't really work for the docs, disable it
> +NO_OBJ?= YES
> +
>  # Document-specific defaults
>  DOCFORMAT?=	docbook
>  MAINTAINER?=	doc at FreeBSD.org
> @@ -107,7 +110,7 @@ DOC_LOCAL_MK=	${DOC_PREFIX}/${LANGCODE}/share/mk/doc.l
>  
>  # parallel build for target "all" and "clean"
>  NCPU?= ${.MAKE.JOBS}
> -p-all p-clean p-obj:
> +p-all p-clean:
>  	make -V SUBDIR | sed -E 's/[ ]+$$//' | tr " " "\n" | \
>  		sed -E 's/^/make -C /; s/$$/ ${.TARGET:S/^p-//}/' | \
>  		tr '\n' '\0' | xargs -0 -n1 -P${NCPU:S/^$$/8/} /bin/sh -c
>
> Modified: head/share/mk/web.site.mk
> ==============================================================================
> --- head/share/mk/web.site.mk	Fri Oct  6 09:36:06 2017	(r51064)
> +++ head/share/mk/web.site.mk	Fri Oct  6 10:44:00 2017	(r51065)
> @@ -325,6 +325,9 @@ _PROGSUBDIR: .USE
>  .endfor
>  .endif
>  
> +# 'make obj' doesn't really work for the docs, disable it
> +NO_OBJ?= YES
> +
>  .include <bsd.obj.mk>
>  
>  #
>
>

-- 
Mathieu Arnold