===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.66
retrieving revision 1.74
diff -u -r1.66 -r1.74
--- src/Makefile	2001/05/14 12:34:26	1.66
+++ src/Makefile	2001/09/01 16:03:18	1.74
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.66 2001/05/14 12:34:26 espie Exp $
+#	$OpenBSD: Makefile,v 1.74 2001/09/01 16:03:18 drahn Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -42,6 +42,10 @@
 SUBDIR+= kerberosIV
 .endif
 
+.if (${KERBEROS5:L} == "yes")
+SUBDIR+= kerberosV
+.endif
+
 .if   make(clean) || make(cleandir) || make(obj)
 SUBDIR+= distrib
 .endif
@@ -57,7 +61,7 @@
 .endif
 
 includes:
-	cd ${.CURDIR}/include && ${MAKE} prereq && exec ${MAKE} includes
+	cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes
 
 beforeinstall:
 	cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} distrib-dirs
@@ -83,13 +87,14 @@
 	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
-.if (${MACHINE_ARCH} == "mips")
-	ldconfig -R
-.endif
 	${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
 
 .if !defined(TARGET)
@@ -109,22 +114,20 @@
 		HOSTCC=cc
 CROSSPATH=	${PATH}:${CROSSDIR}/usr/bin
 
+.if (${TARGET} == "sparc64")
+CROSSENV+= CPPFLAGS=-D__arch64__
+CPPFLAGS=-D__arch64__
+.endif
+
 cross-helpers:
-	mkdir -p ${CROSSDIR}
+	@-mkdir -p ${CROSSDIR}
 	echo _MACHINE_ARCH | \
 	    cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
-	    ${CPP} -E -I${.CURDIR}/sys/arch | \
+	    ${CPP} ${CPPFLAGS} -E -I${.CURDIR}/sys/arch | \
 	    sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
-# GROSS KLUDGE  MACHINE_ARCH is mips, but we use mipsel for gnu tools.
-.if ${TARGET} == "arc" || ${TARGET} == "pmax"
 	eval `grep '^osr=' sys/conf/newvers.sh`; \
-	   sed "s/\$$/el-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
-	   ${CROSSDIR}/TARGET_CANON
-.else
-	eval `grep '^osr=' sys/conf/newvers.sh`; \
 	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
 	   ${CROSSDIR}/TARGET_CANON
-.endif
 
 cross-dirs:	${CROSSDIR}/stamp.dirs
 	@-mkdir -p ${CROSSDIR}
@@ -132,6 +135,7 @@
 	@-mkdir -p ${CROSSDIR}/usr/bin
 	@-mkdir -p ${CROSSDIR}/usr/include
 	@-mkdir -p ${CROSSDIR}/usr/include/kerberosIV
+	@-mkdir -p ${CROSSDIR}/usr/include/kerberosV
 	@-mkdir -p ${CROSSDIR}/usr/lib
 	@-mkdir -p ${CROSSDIR}/usr/libexec
 	@-mkdir -p ${CROSSDIR}/var/db
@@ -154,14 +158,14 @@
 	    MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
 	    ${MAKE} DESTDIR=${CROSSDIR} includes
 
-.if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \
-    ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa"
-cross-binutils: cross-binutils-new
+.if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \
+    ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc" 
+cross-binutils: cross-binutils-new cross-binutils-links
 .else
-cross-binutils: cross-binutils-old
+cross-binutils: cross-binutils-old cross-binutils-links
 .endif
 
-cross-binutils-new:	cross-dirs
+cross-binutils-new:	cross-dirs 
 	export BSDSRCDIR=`pwd`; \
 	    (cd ${.CURDIR}/gnu/usr.bin/binutils; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
@@ -179,9 +183,17 @@
 
 cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \
 	cross-ranlib cross-nm
+
+cross-binutils-links: cross-dirs
 	for cmd in ar as ld nm ranlib size strip; do \
-	    ln -sf $$cmd \
-	    ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd; done
+	    if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
+		ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd \
+		${CROSSDIR}/usr/bin/$$cmd ;\
+	    elif [ -e ${CROSSDIR}/usr/bin/$$cmd -a ! -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
+		ln -sf ${CROSSDIR}/usr/bin/$$cmd \
+		${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd; \
+	    fi ;\
+	done
 
 cross-gas:	cross-dirs
 	(cd ${.CURDIR}/gnu/usr.bin/gas; \
@@ -285,7 +297,7 @@
 	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \
 	    ${CROSSDIR}/usr/bin/cc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${CROSSDIR}/usr/obj/gnu/egcs/gcc/xcpp \
+	    ${CROSSDIR}/usr/obj/gnu/egcs/gcc/cccp \
 	    ${CROSSDIR}/usr/libexec/cpp
 	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \
 	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
@@ -320,6 +332,18 @@
 	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
 	export MACHINE MACHINE_ARCH; \
 	cd kerberosIV/lib; \
+	BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
+	${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN= depend; \
+	${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
+	${CROSSENV} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    ${MAKE} NOMAN= install
+.endif
+.if (${KERBEROS5:L} == "yes")
+	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
+	export MACHINE MACHINE_ARCH; \
+	cd kerberosV/lib; \
 	BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \
 	${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \