From owner-svn-src-all@FreeBSD.ORG  Wed May  9 19:08:54 2012
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 E93231065672;
	Wed,  9 May 2012 19:08:54 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D3A458FC08;
	Wed,  9 May 2012 19: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 q49J8s6B098801;
	Wed, 9 May 2012 19:08:54 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q49J8sUO098798;
	Wed, 9 May 2012 19:08:54 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201205091908.q49J8sUO098798@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 9 May 2012 19:08:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235207 - in head/sys/boot/sparc64: boot1 zfsboot
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: Wed, 09 May 2012 19:08:55 -0000

Author: marius
Date: Wed May  9 19:08:54 2012
New Revision: 235207
URL: http://svn.freebsd.org/changeset/base/235207

Log:
  Use a non-tricky approach for building and installing zfsboot sharing
  the Makefile with boot1.
  
  Submitted by:	ru

Modified:
  head/sys/boot/sparc64/boot1/Makefile
  head/sys/boot/sparc64/zfsboot/Makefile

Modified: head/sys/boot/sparc64/boot1/Makefile
==============================================================================
--- head/sys/boot/sparc64/boot1/Makefile	Wed May  9 18:17:01 2012	(r235206)
+++ head/sys/boot/sparc64/boot1/Makefile	Wed May  9 19:08:54 2012	(r235207)
@@ -5,7 +5,7 @@ INTERNALPROG=
 NO_MAN=
 FILES?=	boot1
 SRCS=	_start.s boot1.c
-CLEANFILES+=boot1 boot1.aout
+CLEANFILES=${FILES} boot1.aout
 
 BOOTBLOCKBASE= 0x4000
 
@@ -14,7 +14,7 @@ LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N
 
 # Construct boot1. sunlabel expects it to contain zeroed-out space for the
 # label, and to be of the correct size.
-boot1: boot1.aout
+${FILES}: boot1.aout
 	@set -- `ls -l boot1.aout`; x=$$((7680-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
 	dd if=/dev/zero of=${.TARGET} bs=512 count=16

Modified: head/sys/boot/sparc64/zfsboot/Makefile
==============================================================================
--- head/sys/boot/sparc64/zfsboot/Makefile	Wed May  9 18:17:01 2012	(r235206)
+++ head/sys/boot/sparc64/zfsboot/Makefile	Wed May  9 19:08:54 2012	(r235207)
@@ -5,9 +5,5 @@
 PROGNAME=	zfsboot
 CFLAGS+=	-DZFSBOOT
 FILES=		zfsboot
-CLEANFILES+=	zfsboot
-
-zfsboot: boot1
-	ln -s ${.ALLSRC} ${.TARGET}
 
 .include "${.CURDIR}/../boot1/Makefile"