generalize Todd's work for ftp/pppd/rsh to ramdisks and miniroots on all

architectures.

7 files changed, 6 insertions, 64 deletions

diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile
index d8da97da8cc..581348d5032 100644
--- a/distrib/i386/Makefile
+++ b/distrib/i386/Makefile
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile,v 1.2 1997/09/07 19:59:02 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 1997/09/17 14:19:19 deraadt Exp $
 
-SUBDIR=	../crunch special floppies
+SUBDIR=	../crunch floppies
 
 .include <bsd.subdir.mk>
diff --git a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
index 2867385aa66..0495629ddb8 100644
--- a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
+++ b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf
@@ -1,9 +1,9 @@
-#	$OpenBSD: instbin-nokrb.conf,v 1.7 1997/09/07 19:59:03 millert Exp $
+#	$OpenBSD: instbin-nokrb.conf,v 1.8 1997/09/17 14:19:22 deraadt Exp $
 #
 # instbin-nokrb.conf - unified binary for the inst/upgr floppies
 #
 
-srcdirs distrib/i386/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 srcdirs usr.sbin/pppd usr.bin/vi sys/arch/i386/stand
 
 progs cat chat chmod chown cp dd df disklabel ed
diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf
index 42213e3043c..b3915f51e16 100644
--- a/distrib/i386/floppies/ramdisk/instbin.conf
+++ b/distrib/i386/floppies/ramdisk/instbin.conf
@@ -1,9 +1,9 @@
-#	$OpenBSD: instbin.conf,v 1.15 1997/09/07 19:59:04 millert Exp $
+#	$OpenBSD: instbin.conf,v 1.16 1997/09/17 14:19:23 deraadt Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
 
-srcdirs distrib/i386/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 srcdirs usr.sbin/pppd usr.bin/vi sys/arch/i386/stand
 
 progs cat chat chmod chown cp dd df disklabel ed
diff --git a/distrib/i386/special/Makefile b/distrib/i386/special/Makefile
deleted file mode 100644
index 31cb1c36d8c..00000000000
--- a/distrib/i386/special/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 1997/09/07 19:59:04 millert Exp $
-
-SUBDIR=	ftp pppd
-
-.include <bsd.subdir.mk>
diff --git a/distrib/i386/special/ftp/Makefile b/distrib/i386/special/ftp/Makefile
deleted file mode 100644
index 46d79762b85..00000000000
--- a/distrib/i386/special/ftp/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 1997/09/07 19:59:05 millert Exp $
-#	$NetBSD: Makefile,v 1.13 1997/08/18 10:20:13 lukem Exp $
-#	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
-
-# Define SMALL to disable command line editing
-CFLAGS+=-DSMALL
-
-# Uncomment the following to provide defaults for gate-ftp operation
-#CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21
-
-# Uncomment the following for socks5 support.
-#CFLAGS += -DSOCKS -include /usr/local/include/socks.h
-#LDADD += -lsocks5
-
-PROG=	ftp
-SRCS=	cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c ruserpass.c \
-	stringlist.c util.c
-MAN=
-.PATH:	${.CURDIR}/../../../../usr.bin/ftp
-
-LDADD+=	-ltermcap
-DPADD+=	${LIBTERMCAP}
-
-#COPTS+= -Wall -Wconversion -Wstrict-prototypes -Wmissing-prototypes
-
-.include <bsd.prog.mk>
diff --git a/distrib/i386/special/pppd/Makefile b/distrib/i386/special/pppd/Makefile
deleted file mode 100644
index 634a4ef55d6..00000000000
--- a/distrib/i386/special/pppd/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 1997/09/07 19:59:06 millert Exp $
-#	$NetBSD: Makefile,v 1.13 1996/12/18 16:54:57 christos Exp $
-
-PROG=	pppd
-SRCS=	auth.c cbcp.c ccp.c chap.c chap_ms.c demand.c fsm.c ipcp.c \
-	ipxcp.c lcp.c magic.c main.c options.c sys-bsd.c upap.c
-
-.PATH:	${.CURDIR}/../../../../usr.sbin/pppd ${.CURDIR}/../../sys/net
-MAN=
-BINMODE=4555
-BINOWN=	root
-
-LDADD=	-lutil
-DPADD=	${LIBUTIL}
-CFLAGS+= -I. -DHAVE_PATHS_H
-
-.include <bsd.prog.mk>
diff --git a/distrib/i386/special/rsh/Makefile b/distrib/i386/special/rsh/Makefile
deleted file mode 100644
index 6ae763fc1e8..00000000000
--- a/distrib/i386/special/rsh/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 1997/09/08 04:35:00 millert Exp $
-
-PROG=	rsh
-SRCS=	rsh.c
-MAN=
-BINOWN=	root
-BINMODE=4555
-.PATH:  ${.CURDIR}/../../../../usr.bin/rsh
-
-.include <bsd.prog.mk>