===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.37
retrieving revision 1.40
diff -u -r1.37 -r1.40
--- src/Makefile	1998/05/18 17:40:00	1.37
+++ src/Makefile	1998/09/07 00:47:11	1.40
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 1998/05/18 17:40:00 mickey Exp $
+#	$OpenBSD: Makefile,v 1.40 1998/09/07 00:47:11 niklas Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -19,6 +19,13 @@
 #
 # 3) If you are reasonably sure that things will compile OK, use the
 # "make build" target supplied here. Good luck.
+#
+# 4) If you want to setup a cross-build environment, there is a "cross-tools"
+# target available which upon completion of "make TARGET=<target> cross-tools" 
+# (where <target> is one of the names in the /sys/arch directory) will produce
+# a set of compilation tools along with the includes in the /usr/cross/<target>
+# directory.
+#
 
 .include <bsd.own.mk>	# for NOMAN, if it's there.
 
@@ -65,11 +72,13 @@
 .ifdef GLOBAL_AUTOCONF_CACHE
 	rm -f ${GLOBAL_AUTOCONF_CACHE}
 .endif
-	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	(cd ${.CURDIR}/include; ${MAKE} includes)
+	(cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)
+	(cd ${.CURDIR}/include; ${SUDO} ${MAKE} includes)
 	${MAKE} cleandir
-	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
-	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
+	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
+	    ${SUDO} ${MAKE} install)
+	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
+	    ${SUDO} ${MAKE} install)
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
 .endif
@@ -79,7 +88,7 @@
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
 .endif
-	${MAKE} depend && ${MAKE} && ${MAKE} install
+	${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install
 
 .if !defined(TARGET)
 cross-tools:
@@ -131,7 +140,7 @@
 	    /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
 	    --prefix ${CROSSDIR}/usr \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
-	    ${MAKE} && ${MAKE} install)
+	    ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install)
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \
 	    ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder
@@ -303,12 +312,13 @@
 		(cd $$lib; \
 		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		    ${MAKE} NOMAN=; \
-		    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-		    ${MAKE} NOMAN= install); \
+		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		    DESTDIR=${CROSSDIR} ${MAKE} NOMAN= install); \
 	    done; \
 	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
-	    SKIPDIR=libocurses/PSD.doc ${MAKE} NOMAN= install)
+	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \
+	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/lib \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib