===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.15
retrieving revision 1.24
diff -u -r1.15 -r1.24
--- src/Makefile	1997/02/28 23:22:07	1.15
+++ src/Makefile	1998/02/15 20:56:40	1.24
@@ -1,19 +1,40 @@
-#	$OpenBSD: Makefile,v 1.15 1997/02/28 23:22:07 niklas Exp $
-#	$NetBSD: Makefile,v 1.25 1995/10/09 02:11:28 thorpej Exp $
+#	$OpenBSD: Makefile,v 1.24 1998/02/15 20:56:40 niklas Exp $
 
+#
+# For more information on building in tricky environments, please see
+# the list of possible environment variables described in
+# /usr/share/mk/bsd.README.
+# 
+# Building recommendations:
+# 
+# 1) If at all possible, put this source tree in /usr/src.  If /usr/src
+# must be a symbolic link, setenv BSDSRCDIR to point to the real location.
+#
+# 2) It is also recommended that you compile with objects outside the
+# source tree. To do this, ensure /usr/obj exists or points to some
+# area of disk of sufficient size.  Then do "cd /usr/src; make obj".
+# This will make a symbolic link called "obj" in each directory, as
+# well as populate the /usr/obj properly with directories for the
+# objects.
+#
+# 3) If you are reasonably sure that things will compile OK, use the
+# "make build" target supplied here. Good luck.
+
 .include <bsd.own.mk>	# for NOMAN, if it's there.
 
-# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW
-
 SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share games
 SUBDIR+= gnu
 
 SUBDIR+= sys lkm
 
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 SUBDIR+= kerberosIV
 .endif
 
+.if   make(clean) || make(cleandir) || make(obj)
+SUBDIR+= distrib
+.endif
+
 .if exists(regress)
 .ifmake !(install)
 SUBDIR+= regress
@@ -41,6 +62,9 @@
 .endif
 
 build:
+.ifdef GLOBAL_AUTOCONF_CACHE
+	rm -f ${GLOBAL_AUTOCONF_CACHE}
+.endif
 	(cd ${.CURDIR}/share/mk && ${MAKE} install)
 	(cd ${.CURDIR}/include; ${MAKE} includes)
 	${MAKE} cleandir
@@ -49,9 +73,12 @@
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
 .endif
-.if defined(KERBEROS)
+.if (${KERBEROS} == "yes")
 	(cd ${.CURDIR}/kerberosIV && ${MAKE} build)
 .endif
+.if (${MACHINE_ARCH} == "mips")
+	ldconfig
+.endif
 	${MAKE} depend && ${MAKE} && ${MAKE} install
 
 .if !defined(TARGET)
@@ -90,6 +117,20 @@
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.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