diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile index 8f7e534a589b..ee52efe0d204 100644 --- a/sbin/fdisk/Makefile +++ b/sbin/fdisk/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.11 1999/04/15 22:31:23 fvdl Exp $ +# $NetBSD: Makefile,v 1.12 1999/05/02 04:42:47 ross Exp $ +SUBDIR= mbr .if (${MACHINE} == "i386" || ${MACHINE} == "powerpc") PROG= fdisk SRCS= fdisk.c DPADD+= ${LIBUTIL} LDADD+= -lutil +SUBDIR+= mbr_bootsel .endif -.if ${MACHINE} == "i386" -SUBDIR= mbr mbr_bootsel -.endif MAN= fdisk.8 diff --git a/sbin/fdisk/mbr/Makefile b/sbin/fdisk/mbr/Makefile index 45c306f9f1ae..059d1af75ef1 100644 --- a/sbin/fdisk/mbr/Makefile +++ b/sbin/fdisk/mbr/Makefile @@ -1,15 +1,12 @@ -# $NetBSD: Makefile,v 1.4 1999/04/15 22:31:23 fvdl Exp $ +# $NetBSD: Makefile,v 1.5 1999/05/02 04:42:48 ross Exp $ + +MAN= mbr.8 BINDIR= /usr/mdec BINMODE=444 STRIPFLAG= -PROG= mbr -SRCS= mbr.S - -MAN= mbr.8 - .include .if ${OBJECT_FMT} == "ELF" @@ -18,10 +15,15 @@ LDFLAGS+= -e start LDFLAGS+= -e _start -N .endif +.if ${MACHINE} == "i386" +PROG= mbr +SRCS= mbr.S + ${PROG}: ${OBJS} ${LD} -o ${PROG}.tmp ${LDFLAGS} -Ttext 0x600 ${OBJS} ${STRIPPROG} ${PROG}.tmp objcopy -O binary ${PROG}.tmp ${PROG} rm -f ${PROG}.tmp +.endif .include