share/mk/: distcheck: Support an absolute path in $builddir

Signed-off-by: Alejandro Colomar <alx@kernel.org>

10 files changed, 272 insertions, 268 deletions

diff --git a/share/mk/configure/build-depends/coreutils.mk b/share/mk/configure/build-depends/coreutils.mk
index 0338cae5d3..4601f73630 100644
--- a/share/mk/configure/build-depends/coreutils.mk
+++ b/share/mk/configure/build-depends/coreutils.mk
@@ -6,20 +6,21 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_COREUTILS_INCLUDED := 1
 
 
-CP      := cp
-ECHO    := echo
-EXPR    := expr
-HEAD    := head
-INSTALL := install
-LN      := ln
-MKDIR   := mkdir
-RM      := rm
-SORT    := sort
-TAC     := tac
-TAIL    := tail
-TEST    := test
-TOUCH   := touch
-TRUE    := true
+CP       := cp
+ECHO     := echo
+EXPR     := expr
+HEAD     := head
+INSTALL  := install
+LN       := ln
+MKDIR    := mkdir
+REALPATH := realpath
+RM       := rm
+SORT     := sort
+TAC      := tac
+TAIL     := tail
+TEST     := test
+TOUCH    := touch
+TRUE     := true
 
 
 INSTALL_DATA    := $(INSTALL) -m 644
diff --git a/share/mk/dist/check/_.mk b/share/mk/dist/check/_.mk
index 18716be862..e2180609ee 100644
--- a/share/mk/dist/check/_.mk
+++ b/share/mk/dist/check/_.mk
@@ -6,10 +6,15 @@ ifndef MAKEFILE_DIST_CHECK_INCLUDED
 MAKEFILE_DIST_CHECK_INCLUDED := 1
 
 
+include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 include $(MAKEFILEDIR)/configure/directory_variables.mk
 
 
-_DISTCHECKDIR := $(builddir)/distcheck
+_DISTCHECKDIR      := $(shell $(REALPATH) -m $(builddir)/distcheck)
+_DISTCHECKSRCDIR   := $(_DISTCHECKDIR)/$(DISTNAME)
+_DISTCHECKBUILDDIR := $(_DISTCHECKDIR)/$(DISTNAME)_builddir
+_DISTCHECKDESTDIR  := $(_DISTCHECKDIR)/$(DISTNAME)_destdir
+_DISTCHECK_MANDIR  := $(_DISTCHECKBUILDDIR)/man
 
 
 .PHONY: distcheck
diff --git a/share/mk/dist/check/all.mk b/share/mk/dist/check/all.mk
index 788991ea7b..5fa0a0a3ce 100644
--- a/share/mk/dist/check/all.mk
+++ b/share/mk/dist/check/all.mk
@@ -23,7 +23,7 @@ $(builddir)/distcheck.all.touch: \
 $(builddir)/distcheck.all.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	#$(info	$(INFO_)MAKE		all)
 	#$(MAKE) -C $< all \
-	#	'INFO_= all:			'
+	#	'INFO_= all:			' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/build.mk b/share/mk/dist/check/build.mk
index 2c50aed209..e5c5b54393 100644
--- a/share/mk/dist/check/build.mk
+++ b/share/mk/dist/check/build.mk
@@ -16,215 +16,215 @@ include $(MAKEFILEDIR)/dist/tar.mk
 
 
 DISTCHECK_IGNORE_BUILD_CATMAN := \
-	$(_MANDIR)/man3/unlocked_stdio.3.cat \
-	$(_MANDIR)/man3/unlocked_stdio.3.cat.set \
-	$(_MANDIR)/man4/console_codes.4.cat \
-	$(_MANDIR)/man4/console_codes.4.cat.set \
-	$(_MANDIR)/man4/lirc.4.cat \
-	$(_MANDIR)/man4/lirc.4.cat.set \
-	$(_MANDIR)/man5/proc_pid_smaps.5.cat \
-	$(_MANDIR)/man5/proc_pid_smaps.5.cat.set \
-	$(_MANDIR)/man5/tzfile.5.cat \
-	$(_MANDIR)/man5/tzfile.5.cat.set \
-	$(_MANDIR)/man7/ascii.7.cat \
-	$(_MANDIR)/man7/ascii.7.cat.set \
-	$(_MANDIR)/man7/bpf-helpers.7.cat \
-	$(_MANDIR)/man7/bpf-helpers.7.cat.set \
-	$(_MANDIR)/man7/charsets.7.cat \
-	$(_MANDIR)/man7/charsets.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-1.7.cat \
-	$(_MANDIR)/man7/iso_8859-1.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-10.7.cat \
-	$(_MANDIR)/man7/iso_8859-10.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-11.7.cat \
-	$(_MANDIR)/man7/iso_8859-11.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-13.7.cat \
-	$(_MANDIR)/man7/iso_8859-13.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-14.7.cat \
-	$(_MANDIR)/man7/iso_8859-14.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-15.7.cat \
-	$(_MANDIR)/man7/iso_8859-15.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-16.7.cat \
-	$(_MANDIR)/man7/iso_8859-16.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-2.7.cat \
-	$(_MANDIR)/man7/iso_8859-2.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-3.7.cat \
-	$(_MANDIR)/man7/iso_8859-3.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-4.7.cat \
-	$(_MANDIR)/man7/iso_8859-4.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-5.7.cat \
-	$(_MANDIR)/man7/iso_8859-5.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-6.7.cat \
-	$(_MANDIR)/man7/iso_8859-6.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-7.7.cat \
-	$(_MANDIR)/man7/iso_8859-7.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-8.7.cat \
-	$(_MANDIR)/man7/iso_8859-8.7.cat.set \
-	$(_MANDIR)/man7/iso_8859-9.7.cat \
-	$(_MANDIR)/man7/iso_8859-9.7.cat.set \
-	$(_MANDIR)/man8/tzselect.8.cat \
-	$(_MANDIR)/man8/tzselect.8.cat.set \
-	$(_MANDIR)/man8/zdump.8.cat \
-	$(_MANDIR)/man8/zdump.8.cat.set \
-	$(_MANDIR)/man8/zic.8.cat \
-	$(_MANDIR)/man8/zic.8.cat.set
+	$(_DISTCHECK_MANDIR)/man3/unlocked_stdio.3.cat \
+	$(_DISTCHECK_MANDIR)/man3/unlocked_stdio.3.cat.set \
+	$(_DISTCHECK_MANDIR)/man4/console_codes.4.cat \
+	$(_DISTCHECK_MANDIR)/man4/console_codes.4.cat.set \
+	$(_DISTCHECK_MANDIR)/man4/lirc.4.cat \
+	$(_DISTCHECK_MANDIR)/man4/lirc.4.cat.set \
+	$(_DISTCHECK_MANDIR)/man5/proc_pid_smaps.5.cat \
+	$(_DISTCHECK_MANDIR)/man5/proc_pid_smaps.5.cat.set \
+	$(_DISTCHECK_MANDIR)/man5/tzfile.5.cat \
+	$(_DISTCHECK_MANDIR)/man5/tzfile.5.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/ascii.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/ascii.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/charsets.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/charsets.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-1.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-1.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-15.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-15.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-9.7.cat \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-9.7.cat.set \
+	$(_DISTCHECK_MANDIR)/man8/tzselect.8.cat \
+	$(_DISTCHECK_MANDIR)/man8/tzselect.8.cat.set \
+	$(_DISTCHECK_MANDIR)/man8/zdump.8.cat \
+	$(_DISTCHECK_MANDIR)/man8/zdump.8.cat.set \
+	$(_DISTCHECK_MANDIR)/man8/zic.8.cat \
+	$(_DISTCHECK_MANDIR)/man8/zic.8.cat.set
 
 DISTCHECK_IGNORE_BUILD_PS := \
-	$(_MANDIR)/man1/iconv.1.ps \
-	$(_MANDIR)/man1/iconv.1.ps.set \
-	$(_MANDIR)/man2/syscall.2.ps \
-	$(_MANDIR)/man2/syscall.2.ps.set \
-	$(_MANDIR)/man3/newlocale.3.ps \
-	$(_MANDIR)/man3/newlocale.3.ps.set \
-	$(_MANDIR)/man7/address_families.7.ps \
-	$(_MANDIR)/man7/address_families.7.ps.set \
-	$(_MANDIR)/man7/armscii-8.7.ps \
-	$(_MANDIR)/man7/armscii-8.7.ps.set \
-	$(_MANDIR)/man7/ascii.7.ps \
-	$(_MANDIR)/man7/ascii.7.ps.set \
-	$(_MANDIR)/man7/bpf-helpers.7.ps \
-	$(_MANDIR)/man7/bpf-helpers.7.ps.set \
-	$(_MANDIR)/man7/charsets.7.ps \
-	$(_MANDIR)/man7/charsets.7.ps.set \
-	$(_MANDIR)/man7/cp1251.7.ps \
-	$(_MANDIR)/man7/cp1251.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-10.7.ps \
-	$(_MANDIR)/man7/iso_8859-10.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-11.7.ps \
-	$(_MANDIR)/man7/iso_8859-11.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-13.7.ps \
-	$(_MANDIR)/man7/iso_8859-13.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-14.7.ps \
-	$(_MANDIR)/man7/iso_8859-14.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-16.7.ps \
-	$(_MANDIR)/man7/iso_8859-16.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-2.7.ps \
-	$(_MANDIR)/man7/iso_8859-2.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-3.7.ps \
-	$(_MANDIR)/man7/iso_8859-3.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-4.7.ps \
-	$(_MANDIR)/man7/iso_8859-4.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-5.7.ps \
-	$(_MANDIR)/man7/iso_8859-5.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-6.7.ps \
-	$(_MANDIR)/man7/iso_8859-6.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-7.7.ps \
-	$(_MANDIR)/man7/iso_8859-7.7.ps.set \
-	$(_MANDIR)/man7/iso_8859-8.7.ps \
-	$(_MANDIR)/man7/iso_8859-8.7.ps.set \
-	$(_MANDIR)/man7/koi8-r.7.ps \
-	$(_MANDIR)/man7/koi8-r.7.ps.set \
-	$(_MANDIR)/man7/koi8-u.7.ps \
-	$(_MANDIR)/man7/koi8-u.7.ps.set \
-	$(_MANDIR)/man7/vdso.7.ps \
-	$(_MANDIR)/man7/vdso.7.ps.set
+	$(_DISTCHECK_MANDIR)/man1/iconv.1.ps \
+	$(_DISTCHECK_MANDIR)/man1/iconv.1.ps.set \
+	$(_DISTCHECK_MANDIR)/man2/syscall.2.ps \
+	$(_DISTCHECK_MANDIR)/man2/syscall.2.ps.set \
+	$(_DISTCHECK_MANDIR)/man3/newlocale.3.ps \
+	$(_DISTCHECK_MANDIR)/man3/newlocale.3.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/address_families.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/address_families.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/armscii-8.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/armscii-8.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/ascii.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/ascii.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/charsets.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/charsets.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/cp1251.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/cp1251.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/koi8-r.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/koi8-r.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/koi8-u.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/koi8-u.7.ps.set \
+	$(_DISTCHECK_MANDIR)/man7/vdso.7.ps \
+	$(_DISTCHECK_MANDIR)/man7/vdso.7.ps.set
 
 DISTCHECK_IGNORE_BUILD_PDF := \
-	$(_MANDIR)/man1/iconv.1.pdf \
-	$(_MANDIR)/man1/iconv.1.pdf.set \
-	$(_MANDIR)/man2/syscall.2.pdf \
-	$(_MANDIR)/man2/syscall.2.pdf.set \
-	$(_MANDIR)/man3/newlocale.3.pdf \
-	$(_MANDIR)/man3/newlocale.3.pdf.set \
-	$(_MANDIR)/man7/address_families.7.pdf \
-	$(_MANDIR)/man7/address_families.7.pdf.set \
-	$(_MANDIR)/man7/armscii-8.7.pdf \
-	$(_MANDIR)/man7/armscii-8.7.pdf.set \
-	$(_MANDIR)/man7/ascii.7.pdf \
-	$(_MANDIR)/man7/ascii.7.pdf.set \
-	$(_MANDIR)/man7/bpf-helpers.7.pdf \
-	$(_MANDIR)/man7/bpf-helpers.7.pdf.set \
-	$(_MANDIR)/man7/charsets.7.pdf \
-	$(_MANDIR)/man7/charsets.7.pdf.set \
-	$(_MANDIR)/man7/cp1251.7.pdf \
-	$(_MANDIR)/man7/cp1251.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-10.7.pdf \
-	$(_MANDIR)/man7/iso_8859-10.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-11.7.pdf \
-	$(_MANDIR)/man7/iso_8859-11.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-13.7.pdf \
-	$(_MANDIR)/man7/iso_8859-13.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-14.7.pdf \
-	$(_MANDIR)/man7/iso_8859-14.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-16.7.pdf \
-	$(_MANDIR)/man7/iso_8859-16.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-2.7.pdf \
-	$(_MANDIR)/man7/iso_8859-2.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-3.7.pdf \
-	$(_MANDIR)/man7/iso_8859-3.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-4.7.pdf \
-	$(_MANDIR)/man7/iso_8859-4.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-5.7.pdf \
-	$(_MANDIR)/man7/iso_8859-5.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-6.7.pdf \
-	$(_MANDIR)/man7/iso_8859-6.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-7.7.pdf \
-	$(_MANDIR)/man7/iso_8859-7.7.pdf.set \
-	$(_MANDIR)/man7/iso_8859-8.7.pdf \
-	$(_MANDIR)/man7/iso_8859-8.7.pdf.set \
-	$(_MANDIR)/man7/koi8-r.7.pdf \
-	$(_MANDIR)/man7/koi8-r.7.pdf.set \
-	$(_MANDIR)/man7/koi8-u.7.pdf \
-	$(_MANDIR)/man7/koi8-u.7.pdf.set \
-	$(_MANDIR)/man7/vdso.7.pdf \
-	$(_MANDIR)/man7/vdso.7.pdf.set
+	$(_DISTCHECK_MANDIR)/man1/iconv.1.pdf \
+	$(_DISTCHECK_MANDIR)/man1/iconv.1.pdf.set \
+	$(_DISTCHECK_MANDIR)/man2/syscall.2.pdf \
+	$(_DISTCHECK_MANDIR)/man2/syscall.2.pdf.set \
+	$(_DISTCHECK_MANDIR)/man3/newlocale.3.pdf \
+	$(_DISTCHECK_MANDIR)/man3/newlocale.3.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/address_families.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/address_families.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/armscii-8.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/armscii-8.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/ascii.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/ascii.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/charsets.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/charsets.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/cp1251.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/cp1251.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/koi8-r.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/koi8-r.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/koi8-u.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/koi8-u.7.pdf.set \
+	$(_DISTCHECK_MANDIR)/man7/vdso.7.pdf \
+	$(_DISTCHECK_MANDIR)/man7/vdso.7.pdf.set
 
 
 $(builddir)/distcheck.build-pre.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-pre)
 	$(MAKE) -C $< build-pre \
-		'INFO_= build-pre:		'
+		'INFO_= build-pre:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-catman.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-catman)
 	$(MAKE) -C $< -k build-catman \
-		'INFO_= build-catman -k:	' $(HIDE_ERR) \
+		'INFO_= build-catman -k:	' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_CATMAN) \
-		'INFO_= build-catman -i:	' $(HIDE_ERR)
+		'INFO_= build-catman -i:	' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
 	$(MAKE) -C $< build-catman \
-		'INFO_= build-catman:		'
+		'INFO_= build-catman:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-ps.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-ps.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-ps)
 	$(MAKE) -C $< -k build-ps \
-		'INFO_= build-ps -k:		' $(HIDE_ERR) \
+		'INFO_= build-ps -k:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PS) \
-		'INFO_= build-ps -i:		' $(HIDE_ERR)
+		'INFO_= build-ps -i:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
 	$(MAKE) -C $< build-ps \
-		'INFO_= build-ps:		'
+		'INFO_= build-ps:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-pdf.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-pdf.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-pdf)
 	$(MAKE) -C $< -k build-pdf \
-		'INFO_= build-pdf -k:		' $(HIDE_ERR) \
+		'INFO_= build-pdf -k:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PDF) \
-		'INFO_= build-pdf -i:		' $(HIDE_ERR)
+		'INFO_= build-pdf -i:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
 	$(MAKE) -C $< build-pdf \
-		'INFO_= build-pdf:		'
+		'INFO_= build-pdf:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-html.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-html)
 	$(MAKE) -C $< build-html \
-		'INFO_= build-html:		'
+		'INFO_= build-html:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-book.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-book)
 	$(MAKE) -C $< -k build-book \
-		'INFO_= build-book -k:		' $(HIDE_ERR) \
+		'INFO_= build-book -k:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
 	|| $(TRUE)
 	$(MAKE) -C $< build-book \
-		'INFO_= build-book:		'
+		'INFO_= build-book:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/check.mk b/share/mk/dist/check/check.mk
index 75992f860e..9375882bb8 100644
--- a/share/mk/dist/check/check.mk
+++ b/share/mk/dist/check/check.mk
@@ -15,72 +15,72 @@ include $(MAKEFILEDIR)/dist/check/_.mk
 
 
 DISTCHECK_IGNORE_CHECK_CATMAN := \
-	$(_MANDIR)/man1/memusage.1.check-catman.touch \
-	$(_MANDIR)/man3/mallopt.3.check-catman.touch \
-	$(_MANDIR)/man3/unlocked_stdio.3.cat.grep \
-	$(_MANDIR)/man3/unlocked_stdio.3.check-catman.touch \
-	$(_MANDIR)/man4/console_codes.4.cat.grep \
-	$(_MANDIR)/man4/console_codes.4.check-catman.touch \
-	$(_MANDIR)/man4/lirc.4.cat.grep \
-	$(_MANDIR)/man4/lirc.4.check-catman.touch \
-	$(_MANDIR)/man4/smartpqi.4.check-catman.touch \
-	$(_MANDIR)/man4/veth.4.check-catman.touch \
-	$(_MANDIR)/man5/proc_buddyinfo.5.check-catman.touch \
-	$(_MANDIR)/man5/proc_pid_fdinfo.5.check-catman.touch \
-	$(_MANDIR)/man5/proc_pid_maps.5.check-catman.touch \
-	$(_MANDIR)/man5/proc_pid_mountinfo.5.check-catman.touch \
-	$(_MANDIR)/man5/proc_pid_net.5.check-catman.touch \
-	$(_MANDIR)/man5/proc_pid_smaps.5.cat.grep \
-	$(_MANDIR)/man5/proc_pid_smaps.5.check-catman.touch \
-	$(_MANDIR)/man5/proc_timer_stats.5.check-catman.touch \
-	$(_MANDIR)/man5/proc_version.5.check-catman.touch \
-	$(_MANDIR)/man5/slabinfo.5.check-catman.touch \
-	$(_MANDIR)/man5/tzfile.5.cat.grep \
-	$(_MANDIR)/man5/tzfile.5.check-catman.touch \
-	$(_MANDIR)/man7/ascii.7.cat.grep \
-	$(_MANDIR)/man7/ascii.7.check-catman.touch \
-	$(_MANDIR)/man7/bpf-helpers.7.cat.grep \
-	$(_MANDIR)/man7/bpf-helpers.7.check-catman.touch \
-	$(_MANDIR)/man7/charsets.7.cat.grep \
-	$(_MANDIR)/man7/charsets.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-1.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-1.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-10.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-10.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-11.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-11.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-13.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-13.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-14.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-14.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-15.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-15.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-16.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-16.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-2.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-2.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-3.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-3.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-4.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-4.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-5.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-5.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-6.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-6.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-7.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-7.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-8.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-8.7.check-catman.touch \
-	$(_MANDIR)/man7/iso_8859-9.7.cat.grep \
-	$(_MANDIR)/man7/iso_8859-9.7.check-catman.touch \
-	$(_MANDIR)/man7/keyrings.7.check-catman.touch \
-	$(_MANDIR)/man7/uri.7.check-catman.touch \
-	$(_MANDIR)/man8/tzselect.8.cat.grep \
-	$(_MANDIR)/man8/tzselect.8.check-catman.touch \
-	$(_MANDIR)/man8/zdump.8.cat.grep \
-	$(_MANDIR)/man8/zdump.8.check-catman.touch \
-	$(_MANDIR)/man8/zic.8.cat.grep \
-	$(_MANDIR)/man8/zic.8.check-catman.touch
+	$(_DISTCHECK_MANDIR)/man1/memusage.1.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man3/mallopt.3.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man3/unlocked_stdio.3.cat.grep \
+	$(_DISTCHECK_MANDIR)/man3/unlocked_stdio.3.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man4/console_codes.4.cat.grep \
+	$(_DISTCHECK_MANDIR)/man4/console_codes.4.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man4/lirc.4.cat.grep \
+	$(_DISTCHECK_MANDIR)/man4/lirc.4.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man4/smartpqi.4.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man4/veth.4.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/proc_buddyinfo.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/proc_pid_fdinfo.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/proc_pid_maps.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/proc_pid_mountinfo.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/proc_pid_net.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/proc_pid_smaps.5.cat.grep \
+	$(_DISTCHECK_MANDIR)/man5/proc_pid_smaps.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/proc_timer_stats.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/proc_version.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/slabinfo.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man5/tzfile.5.cat.grep \
+	$(_DISTCHECK_MANDIR)/man5/tzfile.5.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/ascii.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/ascii.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/charsets.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/charsets.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-1.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-1.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-15.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-15.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-9.7.cat.grep \
+	$(_DISTCHECK_MANDIR)/man7/iso_8859-9.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/keyrings.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man7/uri.7.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man8/tzselect.8.cat.grep \
+	$(_DISTCHECK_MANDIR)/man8/tzselect.8.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man8/zdump.8.cat.grep \
+	$(_DISTCHECK_MANDIR)/man8/zdump.8.check-catman.touch \
+	$(_DISTCHECK_MANDIR)/man8/zic.8.cat.grep \
+	$(_DISTCHECK_MANDIR)/man8/zic.8.check-catman.touch
 
 
 $(builddir)/distcheck.check-catman.touch: \
@@ -88,12 +88,12 @@ $(builddir)/distcheck.check-catman.touch: \
 $(builddir)/distcheck.check-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		check-catman)
 	$(MAKE) -C $< -k check-catman \
-		'INFO_= check-catman -k:	' $(HIDE_ERR) \
+		'INFO_= check-catman -k:	' builddir=$(_DISTCHECKBUILDDIR) $(HIDE_ERR) \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_CHECK_CATMAN) \
-		'INFO_= check-catman -i:	' $(HIDE_ERR)
+		'INFO_= check-catman -i:	' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
 	$(MAKE) -C $< check-catman \
-		'INFO_= check-catman:		'
+		'INFO_= check-catman:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 $(builddir)/distcheck.check.touch: \
@@ -101,7 +101,7 @@ $(builddir)/distcheck.check.touch: \
 $(builddir)/distcheck.check.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		check)
 	$(MAKE) -C $< check \
-		'INFO_= check:			'
+		'INFO_= check:			' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/dist.mk b/share/mk/dist/check/dist.mk
index 6306de9942..cbab7b7b05 100644
--- a/share/mk/dist/check/dist.mk
+++ b/share/mk/dist/check/dist.mk
@@ -9,15 +9,16 @@ MAKEFILE_DIST_CHECK_DIST_INCLUDED := 1
 include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/_.mk
+include $(MAKEFILEDIR)/dist/check/tar.mk
 
 
-REDIST := $(_DISTCHECKDIR)/$(DISTNAME)/.tmp/$(DISTNAME).tar
+REDIST := $(_DISTCHECKBUILDDIR)/$(DISTNAME).tar
 
 
-$(REDIST): %/.tmp/$(DISTNAME).tar: % | $$(@D)/
+$(REDIST): $(_DISTCHECKSRCDIR) | $$(@D)/
 	$(info	$(INFO_)MAKE		dist)
 	$(MAKE) -C $< dist \
-		'INFO_= dist:			'
+		'INFO_= dist:			' builddir=$(_DISTCHECKBUILDDIR)
 
 
 endif  # include guard
diff --git a/share/mk/dist/check/install.mk b/share/mk/dist/check/install.mk
index d6279394e9..1321a9314b 100644
--- a/share/mk/dist/check/install.mk
+++ b/share/mk/dist/check/install.mk
@@ -13,13 +13,10 @@ include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/_.mk
 
 
-_DESTDIR := $(builddir)/destdir
-
-
 $(builddir)/distcheck.install.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		install)
-	$(MAKE) -C $< install DESTDIR=$(_DESTDIR) \
-		'INFO_= install:		'
+	$(MAKE) -C $< install 'DESTDIR=$(_DISTCHECKDESTDIR)' \
+		'INFO_= install:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/lint.mk b/share/mk/dist/check/lint.mk
index 222e9ef1c3..a5a9eb6fde 100644
--- a/share/mk/dist/check/lint.mk
+++ b/share/mk/dist/check/lint.mk
@@ -16,30 +16,30 @@ include $(MAKEFILEDIR)/dist/check/_.mk
 
 
 DISTCHECK_IGNORE_LINT_MAN := \
-	$(_MANDIR)/man3/pthread_cond_init.3.lint-man.mandoc.touch \
-	$(_MANDIR)/man3/pthread_key_create.3.lint-man.mandoc.touch \
-	$(_MANDIR)/man3/pthread_mutex_init.3.lint-man.mandoc.touch \
-	$(_MANDIR)/man5/dir_colors.5.lint-man.mandoc.touch \
-	$(_MANDIR)/man7/bpf-helpers.7.lint-man.mandoc.touch \
-	$(_MANDIR)/man7/uri.7.lint-man.mandoc.touch \
-	$(_MANDIR)/man8/zic.8.lint-man.mandoc.touch
+	$(_DISTCHECK_MANDIR)/man3/pthread_cond_init.3.lint-man.mandoc.touch \
+	$(_DISTCHECK_MANDIR)/man3/pthread_key_create.3.lint-man.mandoc.touch \
+	$(_DISTCHECK_MANDIR)/man3/pthread_mutex_init.3.lint-man.mandoc.touch \
+	$(_DISTCHECK_MANDIR)/man5/dir_colors.5.lint-man.mandoc.touch \
+	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.lint-man.mandoc.touch \
+	$(_DISTCHECK_MANDIR)/man7/uri.7.lint-man.mandoc.touch \
+	$(_DISTCHECK_MANDIR)/man8/zic.8.lint-man.mandoc.touch
 
 
 $(builddir)/distcheck.lint-man.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		lint-man)
 	$(MAKE) -C $< -k lint-man \
-		'INFO_= lint-man -k:		' $(HIDE_ERR) \
+		'INFO_= lint-man -k:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR) \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_LINT_MAN) \
-		'INFO_= lint-man -i:		' $(HIDE_ERR)
+		'INFO_= lint-man -i:		' builddir=$(_DISTCHECKBUILDDIR)  $(HIDE_ERR)
 	$(MAKE) -C $< lint-man \
-		'INFO_= lint-man:		'
+		'INFO_= lint-man:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 $(builddir)/distcheck.lint-mdoc.touch: $(_DISTCHECKDIR)/$(DISTNAME) | $$(@D)/
 	$(info	$(INFO_)MAKE		lint-mdoc)
 	$(MAKE) -C $< lint-mdoc \
-		'INFO_= lint-mdoc:		'
+		'INFO_= lint-mdoc:		' builddir=$(_DISTCHECKBUILDDIR)
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/tar.mk b/share/mk/dist/check/tar.mk
index 58e298a87b..bc42ce219f 100644
--- a/share/mk/dist/check/tar.mk
+++ b/share/mk/dist/check/tar.mk
@@ -17,7 +17,7 @@ $(_DISTCHECKDIR)/$(DISTNAME).tar: $(DISTFILE) | $$(@D)/
 	$(info	$(INFO_)CP		$@)
 	$(CP) $< $@
 
-$(_DISTCHECKDIR)/$(DISTNAME): %: %.tar | $$(@D)/
+$(_DISTCHECKSRCDIR): %: %.tar | $$(@D)/
 	$(info	$(INFO_)TAR xf		$<)
 	cd $(dir $<) \
 	&& $(TAR) xf $(notdir $<)
diff --git a/share/mk/dist/tar.mk b/share/mk/dist/tar.mk
index 4c20bbb7d8..46de4e651b 100644
--- a/share/mk/dist/tar.mk
+++ b/share/mk/dist/tar.mk
@@ -24,7 +24,7 @@ $(DISTFILE): $(_DISTFILES) $(MK) | $$(@D)/
 	$(DISTFILESCMD) \
 	| $(SED) 's,^$(srcdir)/,$(_DISTDIR)/,' \
 	| $(XARGS) $(TAR) $(TARFLAGS) -rf $@ -C $(srcdir) \
-		--transform 's,^$(_DISTDIR),$(DISTNAME),'
+		--transform 's,^$(patsubst /%,%,$(_DISTDIR)),$(DISTNAME),'
 
 
 .PHONY: dist-tar