diff options
| author | jkh <jkh@FreeBSD.org> | 1998-10-13 09:49:16 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-10-13 09:49:16 +0000 |
| commit | a34efb5727ce01f3ca27cb35450fcf045dd59b9b (patch) | |
| tree | a26d774ab4060815dceaac0936fce5bfe45b8caa /usr.sbin | |
| parent | 6ea02b3494c9f52bbee60ebf9b544ae263769be5 (diff) | |
| download | FreeBSD-src-a34efb5727ce01f3ca27cb35450fcf045dd59b9b.zip FreeBSD-src-a34efb5727ce01f3ca27cb35450fcf045dd59b9b.tar.gz | |
properly conditionalize for alpha.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/sade/disks.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/disks.c | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index 155b93b..db2a2cb 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -52,7 +52,9 @@ makedevs.c: Makefile rtermcap keymap.h ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ >> makedevs.tmp +.if ${MACHINE_ARCH} != "alpha" file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp +.endif mv makedevs.tmp makedevs.c rtermcap: ${.CURDIR}/rtermcap.c diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index de3046f..fd2bed4 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.104 1998/10/07 03:15:08 jkh Exp $ + * $Id: disks.c,v 1.105 1998/10/13 09:45:59 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -135,12 +135,12 @@ print_command_summary() static u_char * getBootMgr(char *dname) { +#ifndef __alpha__ /* only meaningful on x86 */ extern u_char mbr[], boot0[]; char str[80]; char *cp; int i = 0; -#ifndef __alpha__ /* only meaningful on x86 */ cp = variable_get(VAR_BOOTMGR); if (!cp) { /* Figure out what kind of MBR the user wants */ diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index 155b93b..db2a2cb 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -52,7 +52,9 @@ makedevs.c: Makefile rtermcap keymap.h ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ >> makedevs.tmp +.if ${MACHINE_ARCH} != "alpha" file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp +.endif mv makedevs.tmp makedevs.c rtermcap: ${.CURDIR}/rtermcap.c diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index de3046f..fd2bed4 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.104 1998/10/07 03:15:08 jkh Exp $ + * $Id: disks.c,v 1.105 1998/10/13 09:45:59 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -135,12 +135,12 @@ print_command_summary() static u_char * getBootMgr(char *dname) { +#ifndef __alpha__ /* only meaningful on x86 */ extern u_char mbr[], boot0[]; char str[80]; char *cp; int i = 0; -#ifndef __alpha__ /* only meaningful on x86 */ cp = variable_get(VAR_BOOTMGR); if (!cp) { /* Figure out what kind of MBR the user wants */ |
