diff options
| author | Wolfram Schneider <wosch@FreeBSD.org> | 2017-10-06 10:44:00 +0000 |
|---|---|---|
| committer | Wolfram Schneider <wosch@FreeBSD.org> | 2017-10-06 10:44:00 +0000 |
| commit | 9647f5d77d5fcd68fe436bd70ca637e9415f91c1 (patch) | |
| tree | 69d41822b82553c4ed775ea6de52fa843b11eb34 /share/mk | |
| parent | e1ff763ab1ddf3b00de8686e28cfe7a8468f7d2c (diff) | |
'make obj' doesn't really work for the docs, disable it by default
PR: 222488
Notes
svn path=/head/; revision=51065
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/doc.project.mk | 5 | ||||
| -rw-r--r-- | share/mk/web.site.mk | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk index a2acbc8adf..6600ffadf1 100644 --- a/share/mk/doc.project.mk +++ b/share/mk/doc.project.mk @@ -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@FreeBSD.org @@ -107,7 +110,7 @@ DOC_LOCAL_MK= ${DOC_PREFIX}/${LANGCODE}/share/mk/doc.local.mk # 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 diff --git a/share/mk/web.site.mk b/share/mk/web.site.mk index 3a1fee6340..6bacab0e38 100644 --- a/share/mk/web.site.mk +++ b/share/mk/web.site.mk @@ -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> # |