===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.107
retrieving revision 1.110
diff -u -r1.107 -r1.110
--- src/Makefile	2004/10/26 05:01:02	1.107
+++ src/Makefile	2005/01/09 00:14:32	1.110
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.107 2004/10/26 05:01:02 mickey Exp $
+#	$OpenBSD: Makefile,v 1.110 2005/01/09 00:14:32 espie Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -169,8 +169,10 @@
 	@-mkdir -p ${CROSSDIR}/usr/include
 	@(cd ${.CURDIR}/include && \
 	    MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} prereq && \
 	    MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} DESTDIR=${CROSSDIR} includes)
 	@touch ${CROSSINCLUDES}
 
@@ -235,15 +237,6 @@
 	ln -sf ${CROSSDIR}/usr/bin/strip \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
 .endif
-	(cd ${.CURDIR}/usr.bin/nm; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= depend all; \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= install)
-	ln -sf ${CROSSDIR}/usr/bin/nm \
-	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
-	ln -sf ${CROSSDIR}/usr/bin/size \
-	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/size
 	@for cmd in ${BINUTILS}; do \
 	 if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a \
 	 -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
@@ -265,6 +258,7 @@
 # bsd.own.mk can't do it for us
 .if ${TARGET} == "amd64" || ${TARGET} == "cats" || \
     ${TARGET} == "hppa" || ${TARGET} == "hppa64" || \
+    ${TARGET} == "i386" || \
     ${TARGET} == "sparc64" || ${TARGET} == "sgi"
 USE_GCC3=yes
 .endif