diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2001-09-26 00:13:08 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2001-09-26 00:13:08 +0000 |
| commit | 4d7552180d32b255ee86543beba238ae10e31655 (patch) | |
| tree | 67c0b621685422132582f17edc21d43410d92990 /sys/boot | |
| parent | 21377ce065cf89d122c3499a7313a11d5c84161b (diff) | |
| download | src-4d7552180d32b255ee86543beba238ae10e31655.tar.gz src-4d7552180d32b255ee86543beba238ae10e31655.zip | |
Make this 'make obj' safe
Notes
Notes:
svn path=/head/; revision=83948
Diffstat (limited to 'sys/boot')
| -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 d3e6cf304c9e..1ba911d1ba51 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 d3e6cf304c9e..1ba911d1ba51 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 |