From 62072eecc4b3a73b698980cf15363348e6c8095b Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sat, 20 Nov 2004 23:41:25 +0000
Subject: 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(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index afcf838..7227fab 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
-- 
cgit v1.1