Make this work with non-kerberized systems.

Remove bsd.strip on "make clean".

2 files changed, 47 insertions, 4 deletions

diff --git a/distrib/i386/floppies/ramdisk/Makefile b/distrib/i386/floppies/ramdisk/Makefile
index df508539581..20047643f4f 100644
--- a/distrib/i386/floppies/ramdisk/Makefile
+++ b/distrib/i386/floppies/ramdisk/Makefile
@@ -1,11 +1,15 @@
-#	$OpenBSD: Makefile,v 1.20 1997/05/17 04:01:48 millert Exp $
+#	$OpenBSD: Makefile,v 1.21 1997/05/29 18:23:49 kstailey Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 IMAGE=		mr.fs
 CBIN?=		instbin
+.if (${KERBEROS} == "yes")
 CRUNCHCONF?=    ${.CURDIR}/${CBIN}.conf
+.else
+CRUNCHCONF?=    ${.CURDIR}/${CBIN}-nokrb.conf
+.endif
 LISTS=		${.CURDIR}/list
 
 MOUNT_POINT=	/mnt
@@ -90,7 +94,8 @@ install:
 	cp ${FS} ${DESTDIR}/snapshot/${FS}
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
+	crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib -c ${CBIN} \
+	${CRUNCHCONF}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
@@ -100,9 +105,16 @@ do_files:
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
 
+.if (${KERBEROS} == "yes")
 clean cleandir:
-	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c \
-	    bsd bsd.rd bsd.gz floppy*.fs rdsetroot
+	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
+	    *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs rdsetroot
+.else
+clean cleandir:
+	/bin/rm -f core ${IMAGE} ${CBIN}-nokrb ${CBIN}-nokrb.mk \
+	    ${CBIN}-nokrb.cache *.o *.lo *.c \
+	    bsd bsd.rd bsd.gz bsd.strip floppy*.fs rdsetroot
+.endif
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
new file mode 100644
index 00000000000..31bc2bcdcd4
--- /dev/null
+++ b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
@@ -0,0 +1,31 @@
+#	$OpenBSD: instbin-nokrb.conf,v 1.1 1997/05/29 18:23:50 kstailey Exp $
+#
+# instbin.conf - unified binary for the inst/upgr floppies
+#
+
+srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd
+srcdirs usr.bin/vi
+
+progs bad144 cat chat chmod chown cp dd df disklabel ed
+progs expr fsck_ffs ftp fdisk hostname
+progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
+progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs
+progs mv newfs pax pdksh ping pppd pwd reboot rm route build
+progs scsi sed slattach sleep stty sync test tip umount
+progs rsh restore gzip sort grep cut
+
+ln chown chgrp
+ln fsck_ffs fsck
+ln less more
+ln pax tar
+ln pax cpio
+ln pdksh sh
+ln pdksh -sh		# init invokes the shell this way
+ln test [
+ln reboot halt
+ln gzip gunzip
+ln grep egrep
+ln grep fgrep
+ln build vi
+
+libs -ledit -lutil -lcurses -ll -lm -ltermlib