diff options
author | Peter Wemm <peter@FreeBSD.org> | 2004-11-20 23:41:25 +0000 |
---|---|---|
committer | Peter Wemm <peter@FreeBSD.org> | 2004-11-20 23:41:25 +0000 |
commit | 63d76a5f0d5f826a29c16e4d95b59b50c8dc2994 (patch) | |
tree | 1e823e6a4f2d997329d18e53d682798979229282 /Makefile.inc1 | |
parent | 694f13aafffd909aea99deaee487ccb40842f7f9 (diff) | |
download | src-63d76a5f0d5f826a29c16e4d95b59b50c8dc2994.tar.gz src-63d76a5f0d5f826a29c16e4d95b59b50c8dc2994.zip |
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!
Notes
Notes:
svn path=/head/; revision=137951
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 12 |
1 files 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 |