diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/stand/Makefile.inc | 14 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/Makefile | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc index 55643e2a683..38e16b13b68 100644 --- a/sys/arch/i386/stand/Makefile.inc +++ b/sys/arch/i386/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 1997/06/03 08:03:08 maja Exp $ +# $OpenBSD: Makefile.inc,v 1.10 1997/06/30 21:11:18 kstailey Exp $ #CPPFLAGS+=-nostdinc -I/sys CPPFLAGS+=-Wall -Werror -I. -Imachine @@ -19,15 +19,15 @@ HEAP_LIMIT=0x50000 BOOTREL=0x3000 BOOTMAGIC=0xdeadbeef -.if exists(${SADIR}/libsa/${__objdir}) -LIBSA=${SADIR}/libsa/${__objdir}/libsa.a -.else +.if exists(${SADIR}/libsa/libsa.a) LIBSA=${SADIR}/libsa/libsa.a -.endif -.if exists(${SADIR}/libz/${__objdir}) -LIBZ=${SADIR}/libz/${__objdir}/libz.a .else +LIBSA=${SADIR}/libsa/${__objdir}/libsa.a +.endif +.if exists(${SADIR}/libz/libz.a) LIBZ=${SADIR}/libz/libz.a +.else +LIBZ=${SADIR}/libz/${__objdir}/libz.a .endif # NO_NET=no_net diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile index b6169356862..60bff25d986 100644 --- a/sys/arch/i386/stand/boot/Makefile +++ b/sys/arch/i386/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:28 millert Exp $ +# $OpenBSD: Makefile,v 1.7 1997/06/30 21:11:19 kstailey Exp $ PROG= boot SRCS= srt0.S boot.c cmd.c conf.c @@ -9,7 +9,7 @@ LD=ld LDFLAGS+=-nostdlib -Ttext $(START) -z -x -e start_boot -Bstatic INSTALL_STRIP= MAN= boot.8 -SADIR=${.CURDIR}/.. +SADIR= ${.CURDIR}/.. LDADD= ${LIBSA} ${LIBZ} DPADD= ${LIBSA} ${LIBZ} |