cvs commit: src/sbin/bsdlabel Makefile

[Ruslan Ermilov]

On Thu, May 22, 2003 at 11:08:28PM -0700, Peter Wemm wrote:
> peter       2003/05/22 23:08:28 PDT
> 
>   FreeBSD src repository
> 
>   Modified files:
>     sbin/bsdlabel        Makefile 
>   Log:
>   Add amd64 to the MACHINE_ARCH list of systems that link bsdlabel to
>   disklabel.  I just got burnt again by having an old disklabel binary
>   kicking around.
>   
>   Discussed with: phk
>   Approved by:    re (safe amd64 stuff)
>   
>   Revision  Changes    Path
>   1.18      +2 -1      src/sbin/bsdlabel/Makefile
> 
Speaking of which...

Poul-Henning, when do you plan to initiate the de-orbit
burn sequence for /sbin/disklabel, something like this?

%%%
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/bsdlabel/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	17 May 2003 19:06:45 -0000	1.17
+++ Makefile	23 May 2003 06:19:20 -0000
@@ -7,12 +7,6 @@
 SRCS=	bsdlabel.c geom_bsd_enc.c
 #MAN=	bsdlabel.5
 MAN+=	bsdlabel.8
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha"
-LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
-MLINKS=	bsdlabel.8 disklabel.8
-.endif
-
 DPADD=	${LIBGEOM}
 LDADD=	-lgeom
 
@@ -21,6 +15,11 @@
 .endif
 
 .include <bsd.prog.mk>
+
+afterinstall:
+.if exists(${DESTDIR}${BINDIR}/disklabel)
+	rm -f ${DESTDIR}${BINDIR}/disklabel
+.endif
 
 test: ${PROG}
 	sh ${.CURDIR}/runtest.sh
%%%


Cheers,
-- 
Ruslan Ermilov		Sysadmin and DBA,
ru at sunbay.com		Sunbay Software AG,
ru at FreeBSD.org		FreeBSD committer,
+380.652.512.251	Simferopol, Ukraine

http://www.FreeBSD.org	The Power To Serve
http://www.oracle.com	Enabling The Information Age
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20030523/9f8d2237/attachment.bin