d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile bsdlabel on all platforms.

Browse Source 
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.
This commit is contained in:
Poul-Henning Kamp 2003-05-05 21:28:08 +00:00
parent 01de25134f
commit 4917b55e50
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/Makefile
View File

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

10
sbin/bsdlabel/Makefile
View File

@ -6,6 +6,16 @@ SRCS= bsdlabel.c geom_bsd_enc.c
#MAN+= bsdlabel.5 #MAN+= bsdlabel.5
MAN+= bsdlabel.8 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} DDADD= ${LIBGEOM}
LDADD= -lgeom -lbsdxml -lsbuf LDADD= -lgeom -lbsdxml -lsbuf