Compile bsdlabel on all platforms.

Install a link to the disklabel(8) name on i386 and alpha platforms.

Leave old disklabel(8) sources intact but disconnected from the build
for now.

sbin/Makefile

@@ -7,6 +7,7 @@ SUBDIR=	adjkerntz \
 	atacontrol \
 	atm \
 	badsect \
+	bsdlabel \
 	camcontrol \
 	ccdconfig \
 	clri \
@@ -94,7 +95,6 @@ SUBDIR+=ipf \
 SUBDIR+=cxconfig \
 	mount_nwfs \
 	mount_smbfs
-SUBDIR+=disklabel
 .if ${MACHINE} == "pc98"
 SUBDIR+=fdisk_pc98
 .else
@@ -104,15 +104,10 @@ SUBDIR+=fdisk
 
 .if ${MACHINE_ARCH} == "ia64"
 SUBDIR+=fdisk \
-	disklabel \
 	gpt \
 	mca
 .endif
 
-.if ${MACHINE_ARCH} == "alpha"
-SUBDIR+=disklabel
-.endif
-
 .if ${MACHINE_ARCH} == "sparc64"
 SUBDIR+=sunlabel
 .endif

sbin/bsdlabel/Makefile

@@ -6,6 +6,16 @@ SRCS=	bsdlabel.c geom_bsd_enc.c
 #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"
+LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
+MLINKS+= bsdlabel.8 disklabel.8
+.endif
+
 DDADD=  ${LIBGEOM}
 LDADD=  -lgeom -lbsdxml -lsbuf