From 77bc28544a42e71898ee5d334a382497d29e3357 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Wed, 17 Sep 1997 14:19:54 +0000
Subject: generalize Todd's work for ftp/pppd/rsh to ramdisks and miniroots on
 all architectures.

---
 distrib/alpha/Makefile             |  4 ++--
 distrib/alpha/ramdisk/raminst.conf |  4 ++--
 distrib/alpha/special/Makefile     |  5 -----
 distrib/alpha/special/ftp/Makefile | 26 --------------------------
 4 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 distrib/alpha/special/Makefile
 delete mode 100644 distrib/alpha/special/ftp/Makefile

(limited to 'distrib/alpha')

diff --git a/distrib/alpha/Makefile b/distrib/alpha/Makefile
index 7d08958da61..d05e40f71b7 100644
--- a/distrib/alpha/Makefile
+++ b/distrib/alpha/Makefile
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/10 21:04:22 millert Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/09/17 14:19:04 deraadt Exp $
 
-SUBDIR= special ramdisk
+SUBDIR= ramdisk
 
 .include <bsd.subdir.mk>
diff --git a/distrib/alpha/ramdisk/raminst.conf b/distrib/alpha/ramdisk/raminst.conf
index 26d0cb4e092..0aa06bd1222 100644
--- a/distrib/alpha/ramdisk/raminst.conf
+++ b/distrib/alpha/ramdisk/raminst.conf
@@ -1,10 +1,10 @@
 #
-#	$OpenBSD: raminst.conf,v 1.8 1997/09/10 21:04:24 millert Exp $
+#	$OpenBSD: raminst.conf,v 1.9 1997/09/17 14:19:06 deraadt Exp $
 #
 # ram.conf - unified binary for the RAM disk
 #
 
-srcdirs distrib/alpha/special bin sbin usr.bin usr.sbin
+srcdirs distrib/special bin sbin usr.bin usr.sbin
 srcdirs gnu/usr.bin sys/arch/alpha/stand
 
 progs cat chmod chown cp dd df disklabel ed grep expr fsck_ffs ftp 
diff --git a/distrib/alpha/special/Makefile b/distrib/alpha/special/Makefile
deleted file mode 100644
index cf95303875e..00000000000
--- a/distrib/alpha/special/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 1997/09/11 10:38:39 deraadt Exp $
-
-SUBDIR= ftp
-
-.include <bsd.subdir.mk>
diff --git a/distrib/alpha/special/ftp/Makefile b/distrib/alpha/special/ftp/Makefile
deleted file mode 100644
index 8cf18040885..00000000000
--- a/distrib/alpha/special/ftp/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 1997/09/10 21:04:25 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>
-- 
cgit v1.2.3