summaryrefslogtreecommitdiff
path: root/kerberosIV
diff options
context:
space:
mode:
authorHans Insulander <hin@cvs.openbsd.org>2001-06-25 16:31:52 +0000
committerHans Insulander <hin@cvs.openbsd.org>2001-06-25 16:31:52 +0000
commitc8eea18686ccd3f45ea5539a56e5092546b781dc (patch)
tree6598842a9161c409001a958e3a23aae2f6b2be32 /kerberosIV
parent266e2a012b13f1c860bedc02ec83ba3cfba7e8a1 (diff)
Don't build conflicting programs when KERBEROS5 == "yes".
Diffstat (limited to 'kerberosIV')
-rw-r--r--kerberosIV/libexec/Makefile10
-rw-r--r--kerberosIV/usr.bin/Makefile10
-rw-r--r--kerberosIV/usr.sbin/Makefile12
3 files changed, 25 insertions, 7 deletions
diff --git a/kerberosIV/libexec/Makefile b/kerberosIV/libexec/Makefile
index 868821f0e90..f7fb9a71f1e 100644
--- a/kerberosIV/libexec/Makefile
+++ b/kerberosIV/libexec/Makefile
@@ -1,5 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:26 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2001/06/25 16:31:51 hin Exp $
-SUBDIR = kadmind kauthd kerberos kpropd
+.include <bsd.own.mk> # for KERBEROS5
+
+SUBDIR= kauthd kerberos kpropd
+
+.if (${KERBEROS5:L} != "yes")
+SUBDIR+=kadmin
+.endif
.include <bsd.subdir.mk> \ No newline at end of file
diff --git a/kerberosIV/usr.bin/Makefile b/kerberosIV/usr.bin/Makefile
index 40e0d380f56..f764ca7716c 100644
--- a/kerberosIV/usr.bin/Makefile
+++ b/kerberosIV/usr.bin/Makefile
@@ -1,6 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2000/08/31 19:44:50 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2001/06/25 16:31:49 hin Exp $
-SUBDIR = afslog kauth kdestroy kinit klist pagsh
+.include <bsd.own.mk> # for KERBEROS5
+
+SUBDIR= afslog
+
+.if(${KERBEROS5:L} != "yes")
+SUBDIR+=kauth kdestroy kinit klist pagsh
+.endif
# these are not built: kftp kstring2key
diff --git a/kerberosIV/usr.sbin/Makefile b/kerberosIV/usr.sbin/Makefile
index 8090510bd3a..1e8ce454290 100644
--- a/kerberosIV/usr.sbin/Makefile
+++ b/kerberosIV/usr.sbin/Makefile
@@ -1,6 +1,12 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:32 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2001/06/25 16:31:50 hin Exp $
-SUBDIR = kadmin ext_srvtab kdb_destroy kdb_init kdb_util kdb_edit kstash \
- ksrvutil kprop
+.include <bsd.own.mk> # for KERBEROS5
+
+SUBDIR= ext_srvtab kdb_destroy kdb_init kdb_util kdb_edit kstash ksrvutil \
+ kprop
+
+.if(${KERBEROS5:L} != "yes")
+kadmin
+.endif
.include <bsd.subdir.mk> \ No newline at end of file