From 63d76a5f0d5f826a29c16e4d95b59b50c8dc2994 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 20 Nov 2004 23:41:25 +0000
Subject: [PATCH] In the amd64 hybrid libraries case, move the kerberos5 tools
 to before building the kerberos5 includes.  This is not the same patch that
 Bjoern A. Zeeb came up with, but the credit still goes to him for finding the
 problem.  Thanks!

---
 Makefile.inc1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index afcf8388dd60..7227fab986fe 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -393,6 +393,12 @@ build32:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.for _t in obj depend all
+	cd ${.CURDIR}/kerberos5/tools; \
+	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
+.endfor
+.endif
 .for _t in obj includes
 	cd ${.CURDIR}/include; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
@@ -413,12 +419,6 @@ build32:
 	cd ${.CURDIR}/${_dir}; \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
 .endfor
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
-.for _t in obj depend all
-	cd ${.CURDIR}/kerberos5/tools; \
-	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
-.endfor
-.endif
 	cd ${.CURDIR}; \
 	    ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries 
 .for _t in obj depend all