From owner-p4-projects@FreeBSD.ORG  Mon May 19 14:58:13 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7637037B404; Mon, 19 May 2003 14:58:12 -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 1063237B401
	for <perforce@freebsd.org>; Mon, 19 May 2003 14:58:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD45243F93
	for <perforce@freebsd.org>; Mon, 19 May 2003 14:58:11 -0700 (PDT)
	(envelope-from peter@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 h4JLwB0U037407
	for <perforce@freebsd.org>; Mon, 19 May 2003 14:58:11 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4JLwBjg037404
	for perforce@freebsd.org; Mon, 19 May 2003 14:58:11 -0700 (PDT)
Date: Mon, 19 May 2003 14:58:11 -0700 (PDT)
Message-Id: <200305192158.h4JLwBjg037404@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31483 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:58:13 -0000

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

Change 31483 by peter@peter_daintree on 2003/05/19 14:57:53

	I dont know what the hell happened last time, but try and repair
	the damage.

Affected files ...

.. //depot/projects/hammer/sbin/bsdlabel/Makefile#7 integrate

Differences ...

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

@@ -1,29 +1,29 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/17/94
-# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.15 2003/05/05 21:28:08 phk Exp $
+# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.17 2003/05/17 19:06:45 ru Exp $
+
+.PATH: ${.CURDIR}/../../sys/geom
 
 PROG=	bsdlabel
 SRCS=	bsdlabel.c geom_bsd_enc.c
-#MAN+=	bsdlabel.5
+#MAN=	bsdlabel.5
 MAN+=	bsdlabel.8
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64"
 LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
-MLINKS+= bsdlabel.8 disklabel.8
+MLINKS=	bsdlabel.8 disklabel.8
 .endif
 
-DDADD=  ${LIBGEOM}
-LDADD=  -lgeom -lbsdxml -lsbuf
+DPADD=	${LIBGEOM}
+LDADD=	-lgeom
 
 .if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
+CFLAGS+=-DPC98
 .endif
 
-.PATH:  ${.CURDIR}/../../sys/geom
-
 .include <bsd.prog.mk>
 
-test:	${PROG}
+test: ${PROG}
 	sh ${.CURDIR}/runtest.sh
 
-testx:	${PROG}
+testx: ${PROG}
 	sh -x ${.CURDIR}/runtest.sh