From owner-p4-projects@FreeBSD.ORG  Mon May 19 14:43:52 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 26EF137B404; Mon, 19 May 2003 14:43:52 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B745F37B401
	for <perforce@freebsd.org>; Mon, 19 May 2003 14:43:51 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 62E3A43F3F
	for <perforce@freebsd.org>; Mon, 19 May 2003 14:43:51 -0700 (PDT)
	(envelope-from obrien@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4JLhp0U036718
	for <perforce@freebsd.org>; Mon, 19 May 2003 14:43:51 -0700 (PDT)
	(envelope-from obrien@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JLhoA3036714
	for perforce@freebsd.org; Mon, 19 May 2003 14:43:50 -0700 (PDT)
Date: Mon, 19 May 2003 14:43:50 -0700 (PDT)
Message-Id: <200305192143.h4JLhoA3036714@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	obrien@freebsd.org using -f
From: "David E. O'Brien" <obrien@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31480 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 May 2003 21:43:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=31480

Change 31480 by obrien@obrien_trang on 2003/05/19 14:42:52

	bsdlable is the disklabel de'jour on Hammer.

Affected files ...

.. //depot/projects/hammer/sbin/bsdlabel/Makefile#5 edit

Differences ...

==== //depot/projects/hammer/sbin/bsdlabel/Makefile#5 (text+ko) ====

@@ -6,12 +6,7 @@
 #MAN+=	bsdlabel.5
 MAN+=	bsdlabel.8
 
-.if ${MACHINE_ARCH} == "i386"
-LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
-MLINKS+= bsdlabel.8 disklabel.8
-.endif
-
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64"
 LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
 MLINKS+= bsdlabel.8 disklabel.8
 .endif