From owner-svn-src-all@FreeBSD.ORG  Sun Jan 17 13:49:18 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 99658106566C;
	Sun, 17 Jan 2010 13:49:18 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 87D3F8FC1D;
	Sun, 17 Jan 2010 13:49:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0HDnIsp041016;
	Sun, 17 Jan 2010 13:49:18 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0HDnIR2041014;
	Sun, 17 Jan 2010 13:49:18 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201001171349.o0HDnIR2041014@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 17 Jan 2010 13:49:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202483 - stable/6
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2010 13:49:18 -0000

Author: bz
Date: Sun Jan 17 13:49:18 2010
New Revision: 202483
URL: http://svn.freebsd.org/changeset/base/202483

Log:
  Backup this part of r202479 which was not meant to be committed along with
  the merge of r201898.

Modified:
  stable/6/Makefile   (contents, props changed)

Modified: stable/6/Makefile
==============================================================================
--- stable/6/Makefile	Sun Jan 17 13:45:33 2010	(r202482)
+++ stable/6/Makefile	Sun Jan 17 13:49:18 2010	(r202483)
@@ -262,14 +262,12 @@ make: .PHONY
 # existing system is.
 #
 .if make(universe)
-TARGETS?=alpha amd64 i386 ia64 pc98 powerpc sparc64
-
 universe: universe_prologue
 universe_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
 	@echo "--------------------------------------------------------------"
-.for target in ${TARGETS}
+.for target in alpha amd64 i386 ia64 pc98 powerpc sparc64
 KERNCONFS!=	cd ${.CURDIR}/sys/${target}/conf && \
 		find [A-Z]*[A-Z] -type f -maxdepth 0 \
 		! -name DEFAULTS ! -name LINT
@@ -277,30 +275,22 @@ KERNCONFS:=	${KERNCONFS:S/^NOTES$/LINT/}
 universe: universe_${target}
 .ORDER: universe_prologue universe_${target} universe_epilogue
 universe_${target}:
-.if !defined(MAKE_JUST_KERNELS)
 	@echo ">> ${target} started on `LC_ALL=C date`"
-	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
-	    ${MAKE} ${JFLAG} buildworld \
+	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
 	    TARGET=${target} \
-	    > _.${target}.buildworld 2>&1 || \
-	    echo "${target} world failed," \
-	    "check _.${target}.buildworld for details")
+	    __MAKE_CONF=/dev/null \
+	    > _.${target}.buildworld 2>&1
 	@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")
+	-cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
+	    > ${.CURDIR}/_.${target}.makeLINT 2>&1
 .endif
 .for kernel in ${KERNCONFS}
-	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
-	    ${MAKE} ${JFLAG} buildkernel \
+	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
 	    TARGET=${target} \
 	    KERNCONF=${kernel} \
-	    > _.${target}.${kernel} 2>&1 || \
-	    echo "${target} ${kernel} kernel failed," \
-	    "check _.${target}.${kernel} for details")
+	    __MAKE_CONF=/dev/null \
+	    > _.${target}.${kernel} 2>&1
 .endfor
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor