From b18071361209a05f488ada6e4312bd4294f26424 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Thu, 14 Jul 2022 00:23:31 +0100 Subject: [PATCH] Makefile.inc1: Add a missing ${dist} to distributeworld for usr/include/i386 Not including ${dist} results in the following non-fatal error printed once per extra distribution: mkdir //usr/obj/usr/src/amd64.amd64/release/dist/usr/include/i386 mkdir: //usr/obj/usr/src/amd64.amd64/release/dist/usr/include: No such file or directory *** Error code 1 (ignored) Also fix a whitespace nit on this line whilst here. Reviewed by: brooks Fixes: a09ea2bbc305 ("amd64: add an i386 include directory") --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 12bb892dfd58..c384267b0ada 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1395,7 +1395,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null .if ${TARGET_ARCH} == "amd64" - -mkdir ${DESTDIR}/${DISTDIR}/usr/include/i386 + -mkdir ${DESTDIR}/${DISTDIR}/${dist}/usr/include/i386 .endif .if ${MK_DEBUG_FILES} != "no" ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.debug.dist \