===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.50
retrieving revision 1.58
diff -u -r1.50 -r1.58
--- src/Makefile	1999/09/27 04:04:52	1.50
+++ src/Makefile	2000/09/03 18:41:11	1.58
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.50 1999/09/27 04:04:52 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.58 2000/09/03 18:41:11 espie Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -38,7 +38,7 @@
 
 SUBDIR+= sys lkm
 
-.if (${KERBEROS} == "yes")
+.if (${KERBEROS:L} == "yes")
 SUBDIR+= kerberosIV
 .endif
 
@@ -80,18 +80,20 @@
 	(cd ${.CURDIR}/include; ${MAKE} prereq; ${SUDO} ${MAKE} includes)
 	${SUDO} ${MAKE} cleandir
 	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
-	    ${SUDO} ${MAKE} install)
+	    NOMAN=1 ${SUDO} ${MAKE} install)
 	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
-	    ${SUDO} ${MAKE} install)
-.if (${MACHINE_ARCH} == "mips")
-	ldconfig
+	    NOMAN=1 ${SUDO} ${MAKE} install)
+.if (${KERBEROS:L} == "yes")
+	(cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
+	    NOMAN=1 ${SUDO} ${MAKE} install)
 .endif
-.if (${KERBEROS} == "yes")
-	(cd ${.CURDIR}/kerberosIV && ${MAKE} SUDO=${SUDO} build)
+	(cd ${.CURDIR}/gnu/usr.bin/perl && \
+	    ${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
+	ldconfig -R
 .endif
-.endif
 	${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install
 
 .if !defined(TARGET)
@@ -169,7 +171,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 +286,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} \
@@ -331,7 +333,7 @@
 	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \
 	    ${MAKE} NOMAN= install)
-.if (${KERBEROS} == "yes")
+.if (${KERBEROS:L} == "yes")
 	(cd kerberosIV; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \