===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.20
retrieving revision 1.25
diff -u -r1.20 -r1.25
--- src/Makefile	1997/07/29 04:07:35	1.20
+++ src/Makefile	1998/03/17 18:10:53	1.25
@@ -1,5 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 1997/07/29 04:07:35 kstailey Exp $
-#	$NetBSD: Makefile,v 1.25 1995/10/09 02:11:28 thorpej Exp $
+#	$OpenBSD: Makefile,v 1.25 1998/03/17 18:10:53 mickey Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -32,6 +31,10 @@
 SUBDIR+= kerberosIV
 .endif
 
+.if   make(clean) || make(cleandir) || make(obj)
+SUBDIR+= distrib
+.endif
+
 .if exists(regress)
 .ifmake !(install)
 SUBDIR+= regress
@@ -73,6 +76,9 @@
 .if (${KERBEROS} == "yes")
 	(cd ${.CURDIR}/kerberosIV && ${MAKE} build)
 .endif
+.if (${MACHINE_ARCH} == "mips")
+	ldconfig
+.endif
 	${MAKE} depend && ${MAKE} && ${MAKE} install
 
 .if !defined(TARGET)
@@ -87,7 +93,8 @@
 	-mkdir -p ${CROSSDIR}/usr/include
 	echo _MACHINE_ARCH | \
 	    cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
-	    ${CPP} -E |sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
+	    ${CPP} -E -I${.CURDIR}/sys/arch | \
+	    sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
 	eval `grep '^osr=' sys/conf/newvers.sh`; \
 	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
 	   ${CROSSDIR}/TARGET_CANON
@@ -104,7 +111,7 @@
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} -f Makefile.bsd-wrapper obj); \
 	    (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \
-	    ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
+	    /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
 	    --prefix ${CROSSDIR}/usr \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
 	    ${MAKE} && ${MAKE} install)
@@ -112,6 +119,20 @@
 	    ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \
 	    ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder
 
+cross-gas:
+	-mkdir -p ${CROSSDIR}/usr/obj
+	-mkdir -p ${CROSSDIR}/usr/bin
+	(cd gnu/usr.bin/gas; \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} obj)
+	(cd gnu/usr.bin/gas; \
+	    TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE})
+	(cd gnu/usr.bin/gas; \
+	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN= install)
+
 cross-gcc:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	(cd gnu/usr.bin/gcc; \
@@ -119,7 +140,7 @@
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} -f Makefile.bsd-wrapper obj)
 	(cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \
-	    ${.CURDIR}/gnu/usr.bin/gcc/configure \
+	    /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \
 	    --prefix ${CROSSDIR}/usr \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
 	    ${MAKE} BISON=yacc LANGUAGES=c \