diff options
| author |   miod <miod@openbsd.org> | 2006-07-11 19:03:27 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2006-07-11 19:03:27 +0000 |
| commit | bced348bbf4ff97bd569e5a1513a145f70ad4e43 (patch) | |
| tree | ced87868bf9cbcb813aec736daade4ff17fc8ff3 | |
| parent | Remove duplicate prototypes already in <sys/systm.h> (diff) | |
| download | wireguard-openbsd-bced348bbf4ff97bd569e5a1513a145f70ad4e43.tar.xz wireguard-openbsd-bced348bbf4ff97bd569e5a1513a145f70ad4e43.zip | |
Let armish and cats recognize MBR partitioning, to come up with proper
disklabel bounds in disklabel -E; while there, sort of sort the architectures.
| -rw-r--r-- | sbin/disklabel/Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile index 6c930f260ae..91342ac269c 100644 --- a/sbin/disklabel/Makefile +++ b/sbin/disklabel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2006/04/26 17:09:34 deraadt Exp $ +# $OpenBSD: Makefile,v 1.41 2006/07/11 19:03:27 miod Exp $ PROG= disklabel SRCS= disklabel.c dkcksum.c editor.c manual.c @@ -27,37 +27,37 @@ manual.c: disklabel.cat8 CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\"" .endif -.if (${MACHINE} == "cats") -CFLAGS+= -DSEEALSO="\"fdisk(8)\"" -.endif - -.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") +.if (${MACHINE} == "amd64") || (${MACHINE} == "i386") CFLAGS+= -DNUMBOOT=2 -DDOSLABEL CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\"" .endif -.if (${MACHINE} == "zaurus") -CFLAGS+= -DNUMBOOT=2 -DDOSLABEL +.if (${MACHINE} == "armish") || (${MACHINE} == "cats") +CFLAGS+= -DDOSLABEL CFLAGS+= -DSEEALSO="\"fdisk(8)\"" .endif - -.if (${MACHINE} == "hp300") || (${MACHINE} == "vax") || \ - (${MACHINE} == "hppa") || (${MACHINE} == "hppa64") +.if (${MACHINE} == "hp300") || (${MACHINE} == "hppa") || \ + (${MACHINE} == "hppa64") || (${MACHINE} == "vax") CFLAGS+= -DNUMBOOT=1 .endif -.if (${MACHINE} == "sun3") || (${MACHINE} == "sparc") || \ - (${MACHINE} == "sparc64") -CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DCYLCHECK -DAAT0 +.if (${MACHINE} == "macppc") +CFLAGS+= -DDOSLABEL +CFLAGS+= -DSEEALSO="\"fdisk(8)\"" .endif .if (${MACHINE} == "mvme68k") || (${MACHINE} == "mvme88k") CFLAGS+= -DSEEALSO="\"installboot(8)\"" .endif -.if (${MACHINE} == "macppc") -CFLAGS+= -DDOSLABEL +.if (${MACHINE} == "solbourne") || (${MACHINE} == "sparc") || \ + (${MACHINE} == "sparc64") +CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DCYLCHECK -DAAT0 +.endif + +.if (${MACHINE} == "zaurus") +CFLAGS+= -DNUMBOOT=2 -DDOSLABEL CFLAGS+= -DSEEALSO="\"fdisk(8)\"" .endif |