diff options
| author | phk <phk@FreeBSD.org> | 2003-05-05 21:28:08 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-05-05 21:28:08 +0000 |
| commit | fe7b626383a17cbc517ac730bb9ffc3fd0cb0006 (patch) | |
| tree | 8e3e76f86b750013bdb10a143506ff2eefa31d0f | |
| parent | ad3e75f51edb275ecaa78bf716f7148a4f647f6d (diff) | |
| download | FreeBSD-src-fe7b626383a17cbc517ac730bb9ffc3fd0cb0006.zip FreeBSD-src-fe7b626383a17cbc517ac730bb9ffc3fd0cb0006.tar.gz | |
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.
| -rw-r--r-- | sbin/Makefile | 7 | ||||
| -rw-r--r-- | sbin/bsdlabel/Makefile | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sbin/Makefile b/sbin/Makefile index 17ecce4..b2636ee 100644 --- a/sbin/Makefile +++ b/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 diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile index 09a2fa6..58c54f5 100644 --- a/sbin/bsdlabel/Makefile +++ b/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 |
