===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.29
retrieving revision 1.31
diff -u -r1.29 -r1.31
--- src/Makefile	1998/05/11 07:43:12	1.29
+++ src/Makefile	1998/05/14 21:43:02	1.31
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 1998/05/11 07:43:12 niklas Exp $
+#	$OpenBSD: Makefile,v 1.31 1998/05/14 21:43:02 niklas Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -231,7 +231,8 @@
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} obj)
-	(cd usr.bin/nm; MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=)
+	(cd usr.bin/nm; MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=)
 	(cd usr.bin/nm; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
@@ -252,6 +253,16 @@
 	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
 	    ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \
 	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" install)
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \
+	    ${CROSSDIR}/usr/bin/cc
+	CPP=`${CROSSDIR}/usr/bin/cc -print-libgcc-file-name | \
+	    sed 's/libgcc\.a/cpp/'`; \
+	    sed -e 's#/usr/libexec/cpp#'$$CPP'#' \
+	    -e 's#/usr/include#${CROSSDIR}/usr/include#' usr.bin/cpp/cpp.sh \
+	    >${CROSSDIR}/usr/bin/cpp
+	chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
+	chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp
+
 .endif
 
 .include <bsd.subdir.mk>