Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Jun 2004 12:23:13 +0300
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        current@FreeBSD.org
Subject:   Can the disklabel(8) link go now?
Message-ID:  <20040604092313.GA12314@ip.net.ua>

next in thread | raw e-mail | index | archive | help

--ZPt4rx8FFjLCG7dd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Gang,

I'd like to remove the old compatibility link from bsdlabel(8)
to disklabel(8).  I think the dust has settled enough to allow
this to be done now (and before 5.3-RELEASE):

%%%
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/sbin/bsdlabel/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	11 Jan 2004 09:11:10 -0000	1.19
+++ Makefile	4 Jun 2004 09:20:31 -0000
@@ -8,17 +8,16 @@
 #MAN=3D	bsdlabel.5
 MAN+=3D	bsdlabel.8
=20
-.if ${MACHINE_ARCH} =3D=3D "i386" || ${MACHINE_ARCH} =3D=3D "alpha" || \
-    ${MACHINE_ARCH} =3D=3D "amd64"
-LINKS=3D	${BINDIR}/bsdlabel ${BINDIR}/disklabel
-MLINKS=3D	bsdlabel.8 disklabel.8
-.endif
-
 DPADD=3D	${LIBGEOM}
 LDADD=3D	-lgeom
=20
 .include <bsd.prog.mk>
=20
+afterinstall:
+.if exists(${DESTDIR}${BINDIR}/disklabel)
+	rm -f ${DESTDIR}${BINDIR}/disklabel
+.endif
+
 test: ${PROG}
 	sh ${.CURDIR}/runtest.sh
=20
%%%

What do you think?


Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer

--ZPt4rx8FFjLCG7dd
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFAwD+BqRfpzJluFF4RAiBFAJ90rZj4nCRvHk0TSgY8hdN+HYTOJwCgmXgN
VXbtnCLTxOd5peov/NkyhA8=
=SXw3
-----END PGP SIGNATURE-----

--ZPt4rx8FFjLCG7dd--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040604092313.GA12314>