From 8d4bc0882ceb31a34909b5932f445affb885f299 Mon Sep 17 00:00:00 2001
From: kstailey <kstailey@openbsd.org>
Date: Sat, 21 Dec 1996 19:21:47 +0000
Subject: [PATCH] make Kerberos libraries conditional to KERBEROS define in
 Makefile

---
 .../i386/floppies/inst-common/Makefile.inc    |  6 ++++-
 .../floppies/inst-common/instbin-krb.conf     | 24 +++++++++++++++++++
 .../i386/floppies/inst-common/instbin.conf    |  4 ++--
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 distrib/i386/floppies/inst-common/instbin-krb.conf

diff --git a/distrib/i386/floppies/inst-common/Makefile.inc b/distrib/i386/floppies/inst-common/Makefile.inc
index 7b14fdce70b..b45ea0f9564 100644
--- a/distrib/i386/floppies/inst-common/Makefile.inc
+++ b/distrib/i386/floppies/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.11 1996/12/21 05:20:21 deraadt Exp $
+#	$Id: Makefile.inc,v 1.12 1996/12/21 19:21:47 kstailey Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -15,7 +15,11 @@ REALIMAGE=	/tmp/image.${PID}
 MDEC=		${DESTDIR}/usr/mdec
 
 LISTS=		${COMMONDIR}/list ${.CURDIR}/list
+.if defined(KERBEROS)
+CRUNCHCONF=	${COMMONDIR}/${CBIN}-krb.conf
+.else
 CRUNCHCONF=	${COMMONDIR}/${CBIN}.conf
+.endif
 MTREE=		${COMMONDIR}/mtree.conf
 
 all: ${CBIN}
diff --git a/distrib/i386/floppies/inst-common/instbin-krb.conf b/distrib/i386/floppies/inst-common/instbin-krb.conf
new file mode 100644
index 00000000000..5840a3e3370
--- /dev/null
+++ b/distrib/i386/floppies/inst-common/instbin-krb.conf
@@ -0,0 +1,24 @@
+#	$OpenBSD: instbin-krb.conf,v 1.1 1996/12/21 19:21:48 kstailey Exp $
+#
+# instbin.conf - unified binary for the inst/upgr floppies
+#
+
+srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+
+progs awk bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs
+progs ftp fdisk
+progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
+progs mount_ffs mount_msdos mount_nfs mount_kernfs
+progs mv newfs pax ping pwd reboot rm route
+progs sed sh shutdown slattach strings stty sync test tip umount
+progs rsh restore gzip
+
+ln chown chgrp
+ln fsck_ffs fsck
+ln less more
+ln pax tar
+ln sh -sh		# init invokes the shell this way
+ln test [
+ln reboot halt
+
+libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lz -lm
diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf
index 23c869ffba2..0a9d6ade65f 100644
--- a/distrib/i386/floppies/inst-common/instbin.conf
+++ b/distrib/i386/floppies/inst-common/instbin.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: instbin.conf,v 1.13 1996/10/09 02:27:24 deraadt Exp $
+#	$OpenBSD: instbin.conf,v 1.14 1996/12/21 19:21:49 kstailey Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
@@ -21,4 +21,4 @@ ln sh -sh		# init invokes the shell this way
 ln test [
 ln reboot halt
 
-libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lz -lm
+libs -ledit -lutil -ltermcap -ll -lz -lm
-- 
2.20.1