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!
This commit is contained in:
Peter Wemm 2004-11-20 23:41:25 +00:00
parent 694f13aaff
commit 63d76a5f0d

View File

@ -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