Don't create cookie until the command is all finished, it or the comm…

…ands after may fail. Sponsored by: EMC / Isilon Storage Division
nhuff · Oct 1, 2015 · 066a643 · 066a643
1 parent 12a36c8
commit 066a643
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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>