diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-03-18 06:21:41 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-03-18 06:21:41 +0000 |
| commit | 0b4fc396775b8075241394f0705aa32a7912a5a1 (patch) | |
| tree | 2caca381e0bfda7976602fffe9758c3718f436fa /sys/arch/sgi/stand | |
| parent | 039a304529d6f63bed86bf9bdf1df132b27ba226 (diff) | |
Fix obj directory probing to support cross compiling.
"Go for it" deraadt@
Diffstat (limited to 'sys/arch/sgi/stand')
| -rw-r--r-- | sys/arch/sgi/stand/Makefile.inc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/arch/sgi/stand/Makefile.inc b/sys/arch/sgi/stand/Makefile.inc index d0a7be610ed..063028b4dcd 100644 --- a/sys/arch/sgi/stand/Makefile.inc +++ b/sys/arch/sgi/stand/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.6 2010/09/14 14:28:05 marco Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2011/03/18 06:21:40 matthew Exp $ # $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $ .ifndef __INCLUDED_STAND_MAKEFILE_INC @@ -24,10 +24,8 @@ LIBSA_CPPFLAGS?= -DNEEDS_HEAP_H ### Figure out what to use for libsa LIBSADIR?= ${.CURDIR}/../libsa -.if exists(${LIBSADIR}/obj.${MACHINE}) -LIBSAOBJDIR= ${LIBSADIR}/obj.${MACHINE} -.elif exists(${LIBSADIR}/obj) -LIBSAOBJDIR= ${LIBSADIR}/obj +.if exists(${LIBSADIR}/${__objdir}) +LIBSAOBJDIR= ${LIBSADIR}/${__objdir} .else LIBSAOBJDIR= ${LIBSADIR} .endif @@ -37,10 +35,8 @@ LIBSA= ${LIBSAOBJDIR}/libsa.a ### Figure out what to use for libz LIBZDIR?= ${.CURDIR}/../libz -.if exists(${LIBZDIR}/obj.${MACHINE}) -LIBZOBJDIR= ${LIBZDIR}/obj.${MACHINE} -.elif exists(${LIBZDIR}/obj) -LIBZOBJDIR= ${LIBZDIR}/obj +.if exists(${LIBZDIR}/${__objdir}) +LIBZOBJDIR= ${LIBZDIR}/${__objdir} .else LIBZOBJDIR= ${LIBZDIR} .endif |