use makeconf.awk throughout, delete instbin in Makefile

3 files changed, 3 insertions, 35 deletions

diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 87f02e69bc7..35ec8264406 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2002/04/28 18:28:34 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/04/30 09:18:20 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -124,6 +124,7 @@ do_files:
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    REV=${REV} ARCHDIR=${.CURDIR}/.. TARGDIR=${MOUNT_POINT} \
 	    UTILS=${UTILS} sh ${UTILS}/runlist.sh ${LISTS}
+	rm ${MOUNT_POINT}/${CBIN}
 
 clean cleandir:
 	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
diff --git a/distrib/sparc64/ramdiskB/instbin.conf b/distrib/sparc64/ramdiskB/instbin.conf
deleted file mode 100644
index 52cb5f54b5f..00000000000
--- a/distrib/sparc64/ramdiskB/instbin.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#       $OpenBSD: instbin.conf,v 1.1 2001/10/10 04:21:02 deraadt Exp $
-#
-# instbin.conf - unified binary for the inst/upgr floppies
-#
-
-srcdirs distrib/special
-srcdirs gnu/usr.bin usr.bin bin sbin usr.sbin
-
-progs dd df mount sync restore
-progs stty ln disklabel pax ping cat ifconfig dmesg ls
-progs less grep umount fsck
-progs mknod route ftp mount_ffs reboot ed
-progs cp gzip chmod fsck_ffs init newfs
-progs rm mt mkdir sed ksh sleep
-progs mv expr test hostname
-
-ln mt eject
-ln chmod chgrp
-ln chmod chown
-ln pax tar
-ln pax cpio
-ln less more
-ln grep fgrep
-ln grep egrep
-ln reboot halt
-ln gzip gunzip
-ln gzip gzcat
-ln ksh sh
-ln ksh -sh
-ln test [
-
-libs -ledit -lutil -lcurses -ll -lm -lkvm -lz -lkrb -ldes
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index 03716f31bd9..072b2eb7f2b 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.11 2002/04/30 01:31:20 deraadt Exp $
+#	$OpenBSD: list,v 1.12 2002/04/30 09:18:20 deraadt Exp $
 
 SRCDIRS distrib/special
 SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -44,7 +44,6 @@ LINK	instbin					usr/bin/ftp
 LINK	instbin					usr/bin/gzip usr/bin/gunzip usr/bin/gzcat
 LINK	instbin					usr/bin/less usr/bin/more
 LINK	instbin					usr/bin/sed
-SPECIAL /bin/rm instbin
 
 ARGVLINK ksh					-sh