From owner-svn-src-stable-7@FreeBSD.ORG  Fri Aug 19 12:08:54 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7B24106564A;
	Fri, 19 Aug 2011 12:08:54 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B73848FC0C;
	Fri, 19 Aug 2011 12:08:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7JC8sF0003048;
	Fri, 19 Aug 2011 12:08:54 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7JC8sMQ003046;
	Fri, 19 Aug 2011 12:08:54 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <201108191208.p7JC8sMQ003046@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Fri, 19 Aug 2011 12:08:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225006 - stable/7/release
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Aug 2011 12:08:54 -0000

Author: nyan
Date: Fri Aug 19 12:08:54 2011
New Revision: 225006
URL: http://svn.freebsd.org/changeset/base/225006

Log:
  MFC: revision 224780
  
    Allow to build a release for stable/[78] on a current box and vise versa.

Modified:
  stable/7/release/Makefile
Directory Properties:
  stable/7/release/   (props changed)
  stable/7/release/doc/   (props changed)
  stable/7/release/doc/en_US.ISO8859-1/hardware/   (props changed)
  stable/7/release/picobsd/tinyware/login/   (props changed)

Modified: stable/7/release/Makefile
==============================================================================
--- stable/7/release/Makefile	Fri Aug 19 12:08:15 2011	(r225005)
+++ stable/7/release/Makefile	Fri Aug 19 12:08:54 2011	(r225006)
@@ -584,7 +584,11 @@ release rerelease:
 	echo "fi"				>> ${_MK}
 	echo "cd /usr/src/release"		>> ${_MK}
 	echo "make obj"				>> ${_MK}
-	echo "make \$${_RELTARGET}"		>> ${_MK}
+	echo "if [ -f Makefile.sysinstall ]; then" >> ${_MK}
+	echo "  make -f Makefile.sysinstall \$${_RELTARGET}" >> ${_MK}
+	echo "else"				>> ${_MK}
+	echo "  make \$${_RELTARGET}"		>> ${_MK}
+	echo "fi"				>> ${_MK}
 	echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK}
 	chmod 755 ${_MK}
 .if defined(NOPORTS)