===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.20
retrieving revision 1.25
diff -u -r1.20 -r1.25
--- src/Makefile.cross	2006/09/27 08:38:58	1.20
+++ src/Makefile.cross	2008/05/13 21:15:58	1.25
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile.cross,v 1.20 2006/09/27 08:38:58 mickey Exp $
+# $OpenBSD: Makefile.cross,v 1.25 2008/05/13 21:15:58 miod Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-etc-root-var
 
 # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
 # this variable to work.
-.if	(${TARGET} == "armish" || ${TARGET} == "cats" || ${TARGET} == "zaurus")
+.if	(${TARGET} == "armish" || ${TARGET} == "zaurus")
 TARGET_ARCH=	arm
 .elif	(${TARGET} == "hp300" || ${TARGET} == "mac68k" || \
 	 ${TARGET} == "mvme68k")
@@ -15,8 +15,13 @@
 TARGET_ARCH=	m88k
 .elif	(${TARGET} == "sgi")
 TARGET_ARCH=	mips64
-.elif	(${TARGET} == "macppc" || ${TARGET} == "mvmeppc")
+.elif	(${TARGET} == "solbourne")
+TARGET_ARCH=	sparc
+.elif	(${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || \
+	 ${TARGET} == "socppc")
 TARGET_ARCH=	powerpc
+.elif	(${TARGET} == "landisk")
+TARGET_ARCH=	sh
 .else
 TARGET_ARCH=	${TARGET}
 .endif
@@ -68,7 +73,9 @@
 
 cross-env:
 	@echo ${CROSSENV} MACHINE=${TARGET} \
-	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`
+	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET}
 
 ${CROSSDIRS}:
 	@-mkdir -p ${CROSSDIR}