From b73737cbd4b63a4981e267d46896c0b0143d560b Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Thu, 1 Oct 2015 21:52:25 +0000
Subject: Don't create cookie until the command is all finished, it or the
 commands after may fail.

Sponsored by:	EMC / Isilon Storage Division
---
 targets/pseudo/bootstrap-tools/Makefile | 6 ++++--
 targets/pseudo/stage/Makefile           | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'targets')

diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index 1b0ebde..b0e62d5 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -43,8 +43,10 @@ BSARGS= 	DESTDIR= \
 
 legacy: .MAKE .META
 	mkdir -p ${LEGACY_TOOLS}
-	${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${BTOOLSDIR} > $@2
-	${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${LEGACY_TOOLS} > $@
+	${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${BTOOLSDIR} \
+	    > $@.distrib-dirs_btoolsdir
+	${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${LEGACY_TOOLS} \
+	    > $@.distrib-dirs_legacy_tools
 	${BSENV} ${MAKE} -C ${SRCTOP} -f Makefile.inc1 ${BSARGS} $@
 	touch $@
 
diff --git a/targets/pseudo/stage/Makefile b/targets/pseudo/stage/Makefile
index 0889ad2..55512e2 100644
--- a/targets/pseudo/stage/Makefile
+++ b/targets/pseudo/stage/Makefile
@@ -8,7 +8,9 @@ all:
 # we don't need to see it.
 stage-distrib-dirs: .META
 	mkdir -p ${STAGE_OBJTOP}
-	${.MAKE} -C ${SRCTOP}/etc distrib-dirs -DWITH_TESTS DESTDIR=${STAGE_OBJTOP} > $@
+	${.MAKE} -C ${SRCTOP}/etc distrib-dirs -DWITH_TESTS \
+	    DESTDIR=${STAGE_OBJTOP} > $@.distrib_dirs
+	touch $@
 
 .include <bsd.prog.mk>
 
-- 
cgit v1.1