diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-03-28 22:40:48 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-03-28 22:40:48 +0000 |
| commit | c20f96b578d6b516a8cae9ee716ea2d2cd5fde87 (patch) | |
| tree | 945adc7c1105bd809351d77e6b9b7894e0bfdbfc /sys/arch | |
| parent | 99e6e5c934f42825134d1321d11c788c1b636c0a (diff) | |
s/SADIR/STANDIR/ to avoid conflict w/ the libsa; install raw boot as well as cooked
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/hppa/stand/Makefile.inc | 28 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/Makefile | 6 |
2 files changed, 18 insertions, 16 deletions
diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc index fc769689789..8e4e8483d11 100644 --- a/sys/arch/hppa/stand/Makefile.inc +++ b/sys/arch/hppa/stand/Makefile.inc @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile.inc,v 1.10 2002/12/08 17:08:32 mickey Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2003/03/28 22:40:47 mickey Exp $ CFLAGS=${DEBUG} -Os -Wall -Werror CPPFLAGS+=-I${S} -I. -I${.CURDIR} -SACFLAGS=-nostdinc -fno-builtin -D_STANDALONE -I${SADIR}/libsa +SACFLAGS=-nostdinc -fno-builtin -D_STANDALONE -I${STANDIR}/libsa SACFLAGS+=-mdisable-fpregs -mfast-indirect-calls -mpa-risc-1-0 SACFLAGS+=-fno-stack-protector #DEBUGFLAGS=-DDEBUG @@ -21,25 +21,25 @@ DEBUGLIBS= no @([ -h machine ] || ln -s $(S)/arch/hppa/include machine) .endif -.if exists(${SADIR}/libsa/libsa.a) -LIBSA=${SADIR}/libsa/libsa.a +.if exists(${STANDIR}/libsa/libsa.a) +LIBSA=${STANDIR}/libsa/libsa.a .else -LIBSA=${SADIR}/libsa/${__objdir}/libsa.a +LIBSA=${STANDIR}/libsa/${__objdir}/libsa.a .endif -.if exists(${SADIR}/libkern/libkern.a) -LIBKERN=${SADIR}/libkern/libkern.a +.if exists(${STANDIR}/libkern/libkern.a) +LIBKERN=${STANDIR}/libkern/libkern.a .else -LIBKERN=${SADIR}/libkern/${__objdir}/libkern.a +LIBKERN=${STANDIR}/libkern/${__objdir}/libkern.a .endif -.if exists(${SADIR}/libz/libz.a) -LIBZ=${SADIR}/libz/libz.a +.if exists(${STANDIR}/libz/libz.a) +LIBZ=${STANDIR}/libz/libz.a .else -LIBZ=${SADIR}/libz/${__objdir}/libz.a +LIBZ=${STANDIR}/libz/${__objdir}/libz.a .endif -.if exists(${SADIR}/mkboot/mkboot) -MKBOOT=${SADIR}/mkboot/mkboot +.if exists(${STANDIR}/mkboot/mkboot) +MKBOOT=${STANDIR}/mkboot/mkboot .else -MKBOOT=${SADIR}/mkboot/${__objdir}/mkboot +MKBOOT=${STANDIR}/mkboot/${__objdir}/mkboot .endif BINDIR= /usr/mdec diff --git a/sys/arch/hppa/stand/boot/Makefile b/sys/arch/hppa/stand/boot/Makefile index 4070535343a..f8eec0bbe11 100644 --- a/sys/arch/hppa/stand/boot/Makefile +++ b/sys/arch/hppa/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2003/01/27 23:56:44 miod Exp $ +# $OpenBSD: Makefile,v 1.17 2003/03/28 22:40:47 mickey Exp $ MAN= boot.8 MANSUBDIR=/hppa @@ -14,7 +14,7 @@ LDFLAGS+=-Bstatic -nostartfiles -nostdlib -N -Ttext $(LINKADDR) LDFLAGS+=-T ${.CURDIR}/ld.script -Map boot.map SIZE?= size STRIP?= strip -SADIR= ${.CURDIR}/.. +STANDIR=${.CURDIR}/.. CRTBEGIN= CRTEND= LINKS= ${BINDIR}/boot.lif ${BINDIR}/sdboot \ @@ -30,6 +30,8 @@ all: boot.lif realinstall: ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + boot ${DESTDIR}${BINDIR} + ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot.lif ${DESTDIR}${BINDIR} # probably we should check for 256k limit for ISL |