summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/stand
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2013-01-18 11:35:25 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2013-01-18 11:35:25 +0000
commit2fca441a963b2f936bc26a6cb65f97a807703bba (patch)
tree48f3c7bb0727e2a8436b0ce1b3ea0ad3fa972549 /sys/arch/amd64/stand
parent2aeb858a1bf98201df0dd043bd798fe81aa418b5 (diff)
Fix the makefile so it works on other architectures.
Found the hard way by bluhm@
Diffstat (limited to 'sys/arch/amd64/stand')
-rw-r--r--sys/arch/amd64/stand/boot/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index 4e6bd6755f6..59154dd8cfc 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.19 2013/01/17 12:37:44 jsing Exp $
+# $OpenBSD: Makefile,v 1.20 2013/01/18 11:35:24 jsing Exp $
MAN?= boot.8
MLINKS?=boot.8 boot.conf.5
-.if ${MACHINE} == "amd64"
-S= ${.CURDIR}/../../../..
-SADIR= ${.CURDIR}/..
-
.if !empty(CFLAGS:M-DFDBOOT)
-SOFTRAID=no
+SOFTRAID?=no
.else
-SOFTRAID=yes
+SOFTRAID?=yes
.endif
+.if ${MACHINE} == "amd64"
+S= ${.CURDIR}/../../../..
+SADIR= ${.CURDIR}/..
+
PROG?= boot
SRCS= srt0.S conf.c
LD?= ld