diff options
author | ru <ru@FreeBSD.org> | 2002-04-26 17:55:27 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2002-04-26 17:55:27 +0000 |
commit | 8ad1c2807b6a01430c9993819b33676991a90da3 (patch) | |
tree | 5e727666c21a8e673dedcd5adfb9a89712365fbb /kerberos5 | |
parent | 7d2926215db2c27174d1971f7ff00e4dd4bdb3da (diff) | |
download | FreeBSD-src-8ad1c2807b6a01430c9993819b33676991a90da3.zip FreeBSD-src-8ad1c2807b6a01430c9993819b33676991a90da3.tar.gz |
Milestone #1 in cross-arch make releases.
Do not install games and profiled libraries to the ${CHROOTDIR}
with the initial installworld.
Eliminate the need in the second installworld. For that, make sure
_everything_ is built in the "world" environment, using the right
tool chain.
Added SUBDIR_OVERRIDE helper stuff to Makefile.inc1. Split the
buildworld process into stages, and skip some stages when
SUBDIR_OVERRIDE is set (used to build crypto, krb4, and krb5
dists).
Added NO_MAKEDB_RUN knob to Makefile.inc1 to avoid running
makewhatis(1) at the end of installworld (used when making crypto,
krb4, and krb5 dists).
In release/scripts/doFS.sh, ensure that the correct boot blocks are
used.
Moved the creation of the "crypto" dist from release.5 to
release.2.
In release.3 and doMFSKERN, build kernels in the "world"
environment. KERNELS now means "additional" kernels, GENERIC is
always built.
Ensure we build crunched binaries in the "world" environment.
Obfuscate release/Makefile some more (WMAKEENV) to achieve this.
Inline createBOOTMFS target.
Use already built GENERIC kernel modules to augment mfsfd's
/stand/modules. GC doMODULES as such.
Assorted fixes:
Get rid of the "afterdistribute" target by moving the single use
of it from sys/Makefile to etc/Makefile's "distribute".
Makefile.inc1: apparently "etc" no longer needs to be last for
"distribute" to succeed.
gnu/usr.bin/perl/library/Makefile.inc: do not override the
"install" and "distribute" targets, do it the "canonical" way.
release/scripts/{man,cat}pages-make.sh: make sure Perl manpages and
catpages appear in the right dists. Note that because Perl does
not respect the MANBUILDCAT (and NOMAN), this results in a loss of
/usr/share/perl/man/cat* empty directories. This will be fixed
soon.
Turn MAKE_KERBEROS4 into a plain boolean variable (if it is set it
means "make KerberosIV"), as documented in the make.conf(5)
manpage. Most of the userland makefiles did not test it for "YES"
anyway.
XXX Should specialized kerberized libpam versions be included into
the krb4 and krb5 dists? (libpam.a would be incorrect anyway if
both krb4 and krb5 dists were choosen.)
Make sure "games" dist is made before "catpages", otherwise games
catpages settle in the wrong dist.
Fast build machine provided by: Igor Kucherenko <kivvy@sunbay.com>
Diffstat (limited to 'kerberos5')
28 files changed, 52 insertions, 80 deletions
diff --git a/kerberos5/Makefile b/kerberos5/Makefile index 1648d0f..673192e 100644 --- a/kerberos5/Makefile +++ b/kerberos5/Makefile @@ -2,26 +2,29 @@ SUBDIR= lib libexec usr.bin usr.sbin -SDIR= ${.CURDIR}/../secure - -bootstrap: cleandir obj depend all install kprog - -help-distribute: distribute - -CODAI= ${MAKE} ${MFLAGS} MAKE_KERBEROS5=yes cleandir && \ - ${MAKE} ${MFLAGS} MAKE_KERBEROS5=yes obj && \ - ${MAKE} ${MFLAGS} MAKE_KERBEROS5=yes depend all install - -CODAD= ${MAKE} ${MFLAGS} MAKE_KERBEROS5=yes cleandir && \ - ${MAKE} ${MFLAGS} MAKE_KERBEROS5=yes obj && \ - ${MAKE} ${MFLAGS} MAKE_KERBEROS5=yes depend all distribute - -kprog: - cd ${SDIR}/usr.bin/ssh; ${CODAI} - cd ${SDIR}/usr.sbin/sshd; ${CODAI} - -help-distribute: distribute - cd ${SDIR}/usr.bin/ssh; ${CODAD} - cd ${SDIR}/usr.sbin/sshd; ${CODAD} +# These are the programs which depend on Kerberos. +KPROGS= secure/usr.bin/ssh secure/usr.sbin/sshd + +# This target is used to rebuild these programs WITH Kerberos. +kerberize: +.for entry in ${KPROGS} + cd ${.CURDIR}/../${entry}; \ + ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 cleandir; \ + ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 obj; \ + ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 depend; \ + ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 all; \ + ${MAKE} ${MFLAGS} -DMAKE_KERBEROS5 install +.endfor + +# This target is used to rebuild these programs WITHOUT Kerberos. +dekerberize: +.for entry in ${KPROGS} + cd ${.CURDIR}/../${entry}; \ + ${MAKE} ${MFLAGS} cleandir; \ + ${MAKE} ${MFLAGS} obj; \ + ${MAKE} ${MFLAGS} depend; \ + ${MAKE} ${MFLAGS} all; \ + ${MAKE} ${MFLAGS} install +.endfor .include <bsd.subdir.mk> diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 447a53d..882c268 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -1,8 +1,6 @@ # $FreeBSD$ -.if !defined(DISTRIBUTION) - -DISTRIBUTION= krb5 +DISTRIBUTION?= krb5 .if !defined(INCLUDEOBJDIR) @@ -14,8 +12,7 @@ TELNETDIR= ${.CURDIR}/../../../crypto/telnet CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4 .endif @@ -177,5 +174,3 @@ KRB5DIR= ${.CURDIR}/../../crypto/heimdal ROKENDIR= ${.CURDIR}/../../lib/libroken .endif - -.endif diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile index c0d5cab..f34d30e 100644 --- a/kerberos5/lib/Makefile +++ b/kerberos5/lib/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ SUBDIR= libroken libvers libasn1 libhdb libkrb5 libkadm5clnt libkadm5srv libsl libgssapi -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) SUBDIR+=libkafs5 .endif SUBDIR+=libtelnet diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index 3c347aa..fd58464 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -8,8 +8,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/include \ -I${KRB5OBJDIR} \ -I${ASN1OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) CFLAGS+=-I${KRB4DIR}/include .endif SRCS= \ diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index eecbe84..a49f27b 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -12,8 +12,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs -lkdb _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} .endif diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index 0197478..6fcdf8d 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -12,8 +12,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs -lkdb _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} .endif diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index c692972..eae62ee 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -12,8 +12,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index b7220ae..9ad1c46 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -12,8 +12,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile index fe56f8d..c4b41cb 100644 --- a/kerberos5/libexec/k5admind/Makefile +++ b/kerberos5/libexec/k5admind/Makefile @@ -14,8 +14,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) SRCS+= version4.c _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile index 0878e6b..3e0596d 100644 --- a/kerberos5/libexec/k5passwdd/Makefile +++ b/kerberos5/libexec/k5passwdd/Makefile @@ -13,8 +13,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index fe56f8d..c4b41cb 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -14,8 +14,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) SRCS+= version4.c _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index 001d77a..d1e1c24 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -20,8 +20,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) SRCS+= 524.c kerberos4.c kaserver.c rx.h _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index 0878e6b..3e0596d 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -13,8 +13,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile index b9d7fc2..6f2f13d 100644 --- a/kerberos5/usr.bin/k5admin/Makefile +++ b/kerberos5/usr.bin/k5admin/Makefile @@ -33,8 +33,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile index c504e83..9d823af 100644 --- a/kerberos5/usr.bin/k5destroy/Makefile +++ b/kerberos5/usr.bin/k5destroy/Makefile @@ -10,8 +10,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile index 9664d5d..8ccdf87 100644 --- a/kerberos5/usr.bin/k5init/Makefile +++ b/kerberos5/usr.bin/k5init/Makefile @@ -11,8 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs _krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile index 3e26057..ec7b8f9 100644 --- a/kerberos5/usr.bin/k5list/Makefile +++ b/kerberos5/usr.bin/k5list/Makefile @@ -10,8 +10,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile index 50f4400..7942633 100644 --- a/kerberos5/usr.bin/k5passwd/Makefile +++ b/kerberos5/usr.bin/k5passwd/Makefile @@ -9,8 +9,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kpasswd \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/k5su/Makefile b/kerberos5/usr.bin/k5su/Makefile index 0ec6314..a9303ef 100644 --- a/kerberos5/usr.bin/k5su/Makefile +++ b/kerberos5/usr.bin/k5su/Makefile @@ -11,8 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${.OBJDIR} NOMAN= true -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5 _krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index b9d7fc2..6f2f13d 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -33,8 +33,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index c504e83..9d823af 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -10,8 +10,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 9664d5d..8ccdf87 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -11,8 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs _krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile index 3e26057..ec7b8f9 100644 --- a/kerberos5/usr.bin/klist/Makefile +++ b/kerberos5/usr.bin/klist/Makefile @@ -10,8 +10,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index 50f4400..7942633 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -9,8 +9,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kpasswd \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile index 0ec6314..a9303ef 100644 --- a/kerberos5/usr.bin/ksu/Makefile +++ b/kerberos5/usr.bin/ksu/Makefile @@ -11,8 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${.OBJDIR} NOMAN= true -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5 _krb4deps= ${LIBKAFS5} ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile index f4bd8bf..707bf93 100644 --- a/kerberos5/usr.sbin/k5stash/Makefile +++ b/kerberos5/usr.sbin/k5stash/Makefile @@ -11,8 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index f4bd8bf..707bf93 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -11,8 +11,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index d4976e0..96ad7df 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -25,8 +25,7 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/admin \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) && \ - (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") +.if defined(MAKE_KERBEROS4) _krb4libs= -lkrb -lkafs _krb4deps= ${LIBKRB} ${LIBKAFS} .endif |