[src/trunk]: src/sbin/fdisk Since fdisk/mbr contains a man page, we need to d...

[ross <ross%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/56071a6c66a7
branches:  trunk
changeset: 472554:56071a6c66a7
user:      ross <ross%NetBSD.org@localhost>
date:      Sun May 02 04:42:47 1999 +0000

description:
Since fdisk/mbr contains a man page, we need to descend into it regardless
of which ${MACHINE} we are.

diffstat:

 sbin/fdisk/Makefile     |   7 +++----
 sbin/fdisk/mbr/Makefile |  14 ++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (61 lines):

diff -r 896f8659bfeb -r 56071a6c66a7 sbin/fdisk/Makefile
--- a/sbin/fdisk/Makefile       Sun May 02 00:26:01 1999 +0000
+++ b/sbin/fdisk/Makefile       Sun May 02 04:42:47 1999 +0000
@@ -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 -r 896f8659bfeb -r 56071a6c66a7 sbin/fdisk/mbr/Makefile
--- a/sbin/fdisk/mbr/Makefile   Sun May 02 00:26:01 1999 +0000
+++ b/sbin/fdisk/mbr/Makefile   Sun May 02 04:42:47 1999 +0000
@@ -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 <bsd.own.mk>
 
 .if ${OBJECT_FMT} == "ELF"
@@ -18,10 +15,15 @@
 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 <bsd.prog.mk>