===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.88
retrieving revision 1.94
diff -u -r1.88 -r1.94
--- src/Makefile	2002/09/17 16:19:49	1.88
+++ src/Makefile	2003/10/05 00:18:02	1.94
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.88 2002/09/17 16:19:49 miod Exp $
+#	$OpenBSD: Makefile,v 1.94 2003/10/05 00:18:02 mickey Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -39,10 +39,6 @@
 
 SUBDIR+= sys lkm
 
-.if (${KERBEROS:L} == "yes")
-SUBDIR+= kerberosIV
-.endif
-
 .if (${KERBEROS5:L} == "yes")
 SUBDIR+= kerberosV
 .endif
@@ -80,18 +76,10 @@
 	    NOMAN=1 exec ${SUDO} ${MAKE} install
 	cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
 	    NOMAN=1 exec ${SUDO} ${MAKE} install
-.if (${KERBEROS:L} == "yes")
-	cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
-	    NOMAN=1 exec ${SUDO} ${MAKE} install
-.endif
 .if (${KERBEROS5:L} == "yes")
 	cd ${.CURDIR}/kerberosV/lib && ${MAKE} depend && ${MAKE} && \
 	    NOMAN=1 exec ${SUDO} ${MAKE} install
 .endif
-	cd ${.CURDIR}/gnu/usr.bin/perl && \
-	    ${MAKE} -f Makefile.bsd-wrapper depend && \
-	    ${MAKE} -f Makefile.bsd-wrapper perl.lib && \
-	    exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib
 	${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
 
 .if !defined(TARGET)
@@ -114,12 +102,12 @@
 		LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \
 		LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/bin/ranlib \
 		SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
-		HOSTCC="${CC}" HOSTCXX="${CXX}" NOMAN= DESTDIR=${CROSSDIR} \
-		HOSTCFLAGS="${CFLAGS}" HOSTCXXFLAGS="${CXXFLAGS}" \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CROSSCFLAGS}" CPPFLAGS="${CROSSCPPFLAGS}" \
-		CXXFLAGS="${CROSSCXXFLAGS}" \
-		LDFLAGS="${CROSSLDFLAGS}"
+		HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= DESTDIR=${CROSSDIR} \
+		HOSTCFLAGS=\"${CFLAGS}\" HOSTCXXFLAGS=\"${CXXFLAGS}\" \
+		HOSTLDFLAGS=\"${LDFLAGS} \" \
+		CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \
+		CXXFLAGS=\"${CROSSCXXFLAGS}\" \
+		LDFLAGS=\"${CROSSLDFLAGS}\"
 CROSSPATH=	${PATH}:${CROSSDIR}/usr/bin
 CROSSLANGS?=	c c++
 
@@ -190,9 +178,9 @@
 	    ${MAKE} DESTDIR=${CROSSDIR} includes)
 	@touch ${CROSSINCLUDES}
 
-.if ${TARGET} == "alpha" || ${TARGET} == "hppa" || ${TARGET} == "macppc" || \
-    ${TARGET} == "mvmeppc" || ${TARGET} == "sgi" || ${TARGET} == "sparc" || \
-    ${TARGET} == "sparc64"
+.if ${TARGET} == "alpha" || ${TARGET} == "hppa" || ${TARGET} == "i386" || \
+    ${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || ${TARGET} == "sgi" || \
+    ${TARGET} == "sparc" || ${TARGET} == "sparc64"
 BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
 		strings strip
 NEW_BINUTILS?=	Yes
@@ -320,24 +308,17 @@
 	(cd ${.CURDIR}/lib; \
 	    for lib in csu libc; do \
 	    (cd $$lib; \
-	        ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		    ${MAKE} depend all install); \
 	    done; \
-	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	        SKIPDIR="${NO_CROSS} libocurses/PSD.doc" \
+	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	        SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
 	        ${MAKE} depend all install)
-.if (${KERBEROS:L} == "yes")
-	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
-	export MACHINE MACHINE_ARCH; \
-	cd kerberosIV/lib; \
-	${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} depend all install
-.endif
 .if (${KERBEROS5:L} == "yes")
 	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
 	export MACHINE MACHINE_ARCH; \
 	cd kerberosV/lib; \
-	${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} depend all install
 .endif
 
@@ -346,8 +327,8 @@
 	export MACHINE MACHINE_ARCH; \
 	for i in libexec bin sbin usr.bin usr.sbin; do \
 	(cd ${.CURDIR}/$$i; \
-	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	        SKIPDIR="${BINUTILS} ${NO_CROSS}" \
+	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	        SKIPDIR=\"${BINUTILS} ${NO_CROSS}\" \
 	        ${MAKE} depend all install); \
 	done