Index: Makefile
===================================================================
--- Makefile	(revision 185415)
+++ Makefile	(working copy)
@@ -276,9 +276,12 @@
 #
 .if make(universe)
 TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v
+UNIVERSERCF?=_.universerc
+UNIVERSEERRINC=`expr \`cat ${UNIVERSERCF}\` + 1 > ${UNIVERSERCF}`
 
 universe: universe_prologue
 universe_prologue:
+	@echo "0" > ${UNIVERSERCF}
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
 	@echo "--------------------------------------------------------------"
@@ -296,15 +299,15 @@
 	    ${MAKE} ${JFLAG} buildworld \
 	    TARGET=${target} \
 	    > _.${target}.buildworld 2>&1 || \
-	    echo "${target} world failed," \
-	    "check _.${target}.buildworld for details")
+	    (echo "${target} world failed," \
+	    "check _.${target}.buildworld for details"; ${UNIVERSEERRINC}))
 	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
 .endif
 .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
 	@(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
 	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
-	    echo "${target} 'make LINT' failed," \
-	    "check _.${target}.makeLINT for details")
+	    (echo "${target} 'make LINT' failed," \
+	    "check _.${target}.makeLINT for details"; ${UNIVERSEERRINC}))
 .endif
 .for kernel in ${KERNCONFS}
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
@@ -312,8 +315,8 @@
 	    TARGET=${target} \
 	    KERNCONF=${kernel} \
 	    > _.${target}.${kernel} 2>&1 || \
-	    echo "${target} ${kernel} kernel failed," \
-	    "check _.${target}.${kernel} for details")
+	    (echo "${target} ${kernel} kernel failed," \
+	    "check _.${target}.${kernel} for details"; ${UNIVERSEERRINC}))
 .endfor
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
@@ -323,4 +326,5 @@
 	@echo ">>> make universe completed on `LC_ALL=C date`"
 	@echo "                      (started ${STARTTIME})"
 	@echo "--------------------------------------------------------------"
+	@exit `cat ${UNIVERSERCF}`
 .endif