===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.48
retrieving revision 1.53
diff -u -r1.48 -r1.53
--- src/Makefile	1999/02/02 08:53:32	1.48
+++ src/Makefile	2000/03/01 03:56:41	1.53
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.48 1999/02/02 08:53:32 imp Exp $
+#	$OpenBSD: Makefile,v 1.53 2000/03/01 03:56:41 todd Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -57,7 +57,7 @@
 .endif
 
 includes:
-	(cd ${.CURDIR}/include; ${MAKE} includes)	
+	(cd ${.CURDIR}/include; ${MAKE} prereq; ${MAKE} includes)
 
 beforeinstall:
 .ifndef DESTDIR
@@ -77,12 +77,17 @@
 	rm -f ${GLOBAL_AUTOCONF_CACHE}
 .endif
 	(cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/include; ${SUDO} ${MAKE} includes)
+	(cd ${.CURDIR}/include; ${MAKE} prereq; ${SUDO} ${MAKE} includes)
 	${SUDO} ${MAKE} cleandir
 	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
 	    ${SUDO} ${MAKE} install)
 	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
 	    ${SUDO} ${MAKE} install)
+	(cd ${.CURDIR}/gnu/usr.bin/perl && \
+	    ${MAKE} -f Makefile.bsd-wrapper config.sh && \
+	    ${MAKE} -f Makefile.bsd-wrapper depend && \
+	    ${MAKE} -f Makefile.bsd-wrapper perl.lib && \
+	    ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib)
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
 .endif
@@ -169,7 +174,7 @@
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
 	    ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install)
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \
+	    ${.CURDIR}/usr.bin/lorder/lorder.sh \
 	    ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder
 	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-as \
 	    ${CROSSDIR}/usr/bin/as
@@ -284,12 +289,12 @@
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
 
 cross-gcc:	cross-dirs
-	cd ${.CURDIR}/gnu/usr.bin/gcc; \
+	cd ${.CURDIR}/gnu/egcs/gcc; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} -f Makefile.bsd-wrapper obj
-	(cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \
-	    /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \
+	(cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \
+	    /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \
 	    --prefix ${CROSSDIR}/usr \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
 	    ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \