diff options
| author | peter <peter@FreeBSD.org> | 2001-09-26 00:13:08 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-09-26 00:13:08 +0000 |
| commit | 5147ce6799665c52646a8dbb19d80df7fb76a3b5 (patch) | |
| tree | 67c0b621685422132582f17edc21d43410d92990 | |
| parent | 66b4873f6403121b593e63940bb1f1f46ce97cb1 (diff) | |
| download | FreeBSD-src-5147ce6799665c52646a8dbb19d80df7fb76a3b5.zip FreeBSD-src-5147ce6799665c52646a8dbb19d80df7fb76a3b5.tar.gz | |
Make this 'make obj' safe
| -rw-r--r-- | sys/boot/ia64/ski/Makefile | 6 | ||||
| -rw-r--r-- | sys/boot/ia64/skiload/Makefile | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile index d3e6cf3..1ba911d 100644 --- a/sys/boot/ia64/ski/Makefile +++ b/sys/boot/ia64/ski/Makefile @@ -24,7 +24,11 @@ LIBFICL= .endif LIBSTAND= -lstand +.if exists(${.OBJDIR}/../libski/libski.a) +LIBSKI= ${.OBJDIR}/../libski/libski.a +.else LIBSKI= ${.CURDIR}/../libski/libski.a +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common @@ -38,7 +42,7 @@ CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../libski CFLAGS+= -DLOADER -LDFLAGS= -nostdlib -T ldscript.ia64 +LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 CLEANFILES+= vers.c vers.o ${PROG}.list CLEANFILES+= loader.help diff --git a/sys/boot/ia64/skiload/Makefile b/sys/boot/ia64/skiload/Makefile index d3e6cf3..1ba911d 100644 --- a/sys/boot/ia64/skiload/Makefile +++ b/sys/boot/ia64/skiload/Makefile @@ -24,7 +24,11 @@ LIBFICL= .endif LIBSTAND= -lstand +.if exists(${.OBJDIR}/../libski/libski.a) +LIBSKI= ${.OBJDIR}/../libski/libski.a +.else LIBSKI= ${.CURDIR}/../libski/libski.a +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common @@ -38,7 +42,7 @@ CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../libski CFLAGS+= -DLOADER -LDFLAGS= -nostdlib -T ldscript.ia64 +LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 CLEANFILES+= vers.c vers.o ${PROG}.list CLEANFILES+= loader.help |
