===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.55
retrieving revision 1.59
diff -u -r1.55 -r1.59
--- src/Makefile	2000/04/09 07:48:14	1.55
+++ src/Makefile	2000/12/12 18:37:12	1.59
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.55 2000/04/09 07:48:14 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.59 2000/12/12 18:37:12 art 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,15 +80,14 @@
 	(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 (${KERBEROS} == "yes")
+	    NOMAN=1 ${SUDO} ${MAKE} install)
+.if (${KERBEROS:L} == "yes")
 	(cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
-	    ${SUDO} ${MAKE} install)
+	    NOMAN=1 ${SUDO} ${MAKE} install)
 .endif
 	(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)
@@ -169,6 +168,7 @@
 	    (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \
 	    /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
 	    --prefix ${CROSSDIR}/usr \
+	    --disable-nls --disable-gdbtk --disable-commonbfdlib \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
 	    ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install)
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
@@ -334,7 +334,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} \