From ad6481dddcaab3363fa5f76489ba8ec11d5a235e Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Wed, 28 Jun 2017 19:05:04 +0000 Subject: [PATCH] Allow parallel installworld (-j N) and poudriere installworld (poudriere jail -c and poudriere jail -u) to proceed. Reviewed by: trasz@ Tested by: trasz@, cy@ MFC after: 1 month X-MFC-with: r320362 --- share/zoneinfo/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 044956b856c..b83bbb6a730 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -94,7 +94,7 @@ install-zoneinfo: .for f in ${TZS} ${INSTALL} ${TAG_ARGS} \ -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${TZBUILDDIR:C,^${.OBJDIR}/,,}/${f} ${DESTDIR}/usr/share/zoneinfo/${f} + ${TZBUILDDIR}/${f} ${DESTDIR}/usr/share/zoneinfo/${f} .endfor ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/