aboutsummaryrefslogtreecommitdiff
path: root/kerberos5
diff options
context:
space:
mode:
Diffstat (limited to 'kerberos5')
-rw-r--r--kerberos5/Makefile45
-rw-r--r--kerberos5/Makefile.inc9
-rw-r--r--kerberos5/lib/Makefile3
-rw-r--r--kerberos5/lib/libkrb5/Makefile3
-rw-r--r--kerberos5/libexec/hprop/Makefile3
-rw-r--r--kerberos5/libexec/hpropd/Makefile3
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile3
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile3
-rw-r--r--kerberos5/libexec/k5admind/Makefile3
-rw-r--r--kerberos5/libexec/k5passwdd/Makefile3
-rw-r--r--kerberos5/libexec/kadmind/Makefile3
-rw-r--r--kerberos5/libexec/kdc/Makefile3
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile3
-rw-r--r--kerberos5/usr.bin/k5admin/Makefile3
-rw-r--r--kerberos5/usr.bin/k5destroy/Makefile3
-rw-r--r--kerberos5/usr.bin/k5init/Makefile3
-rw-r--r--kerberos5/usr.bin/k5list/Makefile3
-rw-r--r--kerberos5/usr.bin/k5passwd/Makefile3
-rw-r--r--kerberos5/usr.bin/k5su/Makefile3
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile3
-rw-r--r--kerberos5/usr.bin/kdestroy/Makefile3
-rw-r--r--kerberos5/usr.bin/kinit/Makefile3
-rw-r--r--kerberos5/usr.bin/klist/Makefile3
-rw-r--r--kerberos5/usr.bin/kpasswd/Makefile3
-rw-r--r--kerberos5/usr.bin/ksu/Makefile3
-rw-r--r--kerberos5/usr.sbin/k5stash/Makefile3
-rw-r--r--kerberos5/usr.sbin/kstash/Makefile3
-rw-r--r--kerberos5/usr.sbin/ktutil/Makefile3
28 files changed, 52 insertions, 80 deletions
diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index 1648d0f9a6eb..673192e2231b 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 447a53dd2b3a..882c268b8d5a 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 c0d5cab9df14..f34d30e6dc37 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 3c347aa71849..fd58464def9e 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 eecbe84d0c18..a49f27bd2141 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 0197478132c7..6fcdf8d09bdc 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 c692972dae33..eae62ee26841 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 b7220ae5c16c..9ad1c460508b 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 fe56f8dc9f98..c4b41cbf02af 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 0878e6b220ec..3e0596dd677f 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 fe56f8dc9f98..c4b41cbf02af 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 001d77aaad5e..d1e1c24622ec 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 0878e6b220ec..3e0596dd677f 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 b9d7fc2086d2..6f2f13dcc447 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 c504e832acec..9d823afbbd3b 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 9664d5d67b5b..8ccdf87a3c00 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 3e260572802d..ec7b8f9a8f2e 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 50f4400ecde5..79426338151d 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 0ec631471a64..a9303ef6b1a5 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 b9d7fc2086d2..6f2f13dcc447 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 c504e832acec..9d823afbbd3b 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 9664d5d67b5b..8ccdf87a3c00 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 3e260572802d..ec7b8f9a8f2e 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 50f4400ecde5..79426338151d 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 0ec631471a64..a9303ef6b1a5 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 f4bd8bfd4691..707bf93f3e8b 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 f4bd8bfd4691..707bf93f3e8b 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 d4976e060757..96ad7df84eb1 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