svn commit: r288462 - in head/targets/pseudo: bootstrap-tools stage

[Bryan Drewery]

Author: bdrewery
Date: Thu Oct  1 21:52:25 2015
New Revision: 288462
URL: https://svnweb.freebsd.org/changeset/base/288462

Log:
  Don't create cookie until the command is all finished, it or the commands
  after may fail.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/targets/pseudo/bootstrap-tools/Makefile
  head/targets/pseudo/stage/Makefile

Modified: head/targets/pseudo/bootstrap-tools/Makefile
==============================================================================
--- head/targets/pseudo/bootstrap-tools/Makefile	Thu Oct  1 20:54:19 2015	(r288461)
+++ head/targets/pseudo/bootstrap-tools/Makefile	Thu Oct  1 21:52:25 2015	(r288462)
@@ -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 $@
 

Modified: head/targets/pseudo/stage/Makefile
==============================================================================
--- head/targets/pseudo/stage/Makefile	Thu Oct  1 20:54:19 2015	(r288461)
+++ head/targets/pseudo/stage/Makefile	Thu Oct  1 21:52:25 2015	(r288462)
@@ -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>