===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.57
retrieving revision 1.62
diff -u -r1.57 -r1.62
--- src/Makefile	2000/08/01 15:56:38	1.57
+++ src/Makefile	2001/01/17 20:14:04	1.62
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.57 2000/08/01 15:56:38 millert Exp $
+#	$OpenBSD: Makefile,v 1.62 2001/01/17 20:14:04 mickey 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
 
@@ -74,7 +74,7 @@
 
 build:
 .ifdef GLOBAL_AUTOCONF_CACHE
-	rm -f ${GLOBAL_AUTOCONF_CACHE}
+	cp /dev/null ${GLOBAL_AUTOCONF_CACHE}
 .endif
 	(cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)
 	(cd ${.CURDIR}/include; ${MAKE} prereq; ${SUDO} ${MAKE} includes)
@@ -83,7 +83,7 @@
 	    NOMAN=1 ${SUDO} ${MAKE} install)
 	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
 	    NOMAN=1 ${SUDO} ${MAKE} install)
-.if (${KERBEROS} == "yes")
+.if (${KERBEROS:L} == "yes")
 	(cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
 	    NOMAN=1 ${SUDO} ${MAKE} install)
 .endif
@@ -168,35 +168,12 @@
 	    (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)
+	    ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} install)
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.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
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ar \
-	    ${CROSSDIR}/usr/bin/ar
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ld \
-	    ${CROSSDIR}/usr/bin/ld
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strip \
-	    ${CROSSDIR}/usr/bin/strip
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-size \
-	    ${CROSSDIR}/usr/bin/size
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ranlib \
-	    ${CROSSDIR}/usr/bin/ranlib
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-nm \
-	    ${CROSSDIR}/usr/bin/nm
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strings \
-	    ${CROSSDIR}/usr/bin/strings
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder \
 	    ${CROSSDIR}/usr/bin/lorder
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objcopy \
-	    ${CROSSDIR}/usr/bin/objcopy
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objdump \
-	    ${CROSSDIR}/usr/bin/objdump
-	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gdb \
-	    ${CROSSDIR}/usr/bin/gdb
 
 cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \
 	cross-ranlib cross-nm
@@ -333,7 +310,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} \