From 84993877372cbf47079e563443174892920ea30e Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Mon, 3 Jun 1996 07:23:03 +0000
Subject: put all this stuff in /usr/sbin. include fed, it's now working w/ new
 curses.

---
 sys/arch/i386/isa/pcvt/Util/Makefile          | 2 +-
 sys/arch/i386/isa/pcvt/Util/Makefile.inc      | 4 ++--
 sys/arch/i386/isa/pcvt/Util/fed/Makefile      | 3 +--
 sys/arch/i386/isa/pcvt/Util/fed/fed.h         | 2 +-
 sys/arch/i386/isa/pcvt/Util/fontedit/Makefile | 1 -
 sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile   | 2 --
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/sys/arch/i386/isa/pcvt/Util/Makefile b/sys/arch/i386/isa/pcvt/Util/Makefile
index fc23821669c..97bf6993fe6 100644
--- a/sys/arch/i386/isa/pcvt/Util/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/Makefile
@@ -1,5 +1,5 @@
 SUBDIR= 	keycap cursor fontedit fonts kcon loadfont scon \
-		userkeys vttest ispcvt mcon pcvtdoc
+		userkeys vttest ispcvt mcon pcvtdoc fed
 
 .if make(clean) || make(cleandir) || make(obj)
 SUBDIR+=	vgaio kbdio set2061
diff --git a/sys/arch/i386/isa/pcvt/Util/Makefile.inc b/sys/arch/i386/isa/pcvt/Util/Makefile.inc
index 70eb3a03513..cb4df21be19 100644
--- a/sys/arch/i386/isa/pcvt/Util/Makefile.inc
+++ b/sys/arch/i386/isa/pcvt/Util/Makefile.inc
@@ -2,9 +2,9 @@
 
 ECHO	?=	echo
 
-BINDIR	=	/usr/local/bin
+BINDIR	=	/usr/sbin
 FONTDIR	=	/usr/share/misc/pcvtfonts
-LIBDIR	=	/usr/local/lib
+LIBDIR	=	/usr/lib
 LIBMODE	=	644
 
 # for pcvt_ioctl.h
diff --git a/sys/arch/i386/isa/pcvt/Util/fed/Makefile b/sys/arch/i386/isa/pcvt/Util/fed/Makefile
index 9e4503a7b13..195caf54b41 100644
--- a/sys/arch/i386/isa/pcvt/Util/fed/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/fed/Makefile
@@ -1,6 +1,5 @@
 PROG=	fed
 SRCS=	fed.c select.c edit.c misc.c
-LDADD=	-lncurses
-BINDIR=	/usr/local/bin
+LDADD=	-lcurses -ltermlib
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/fed/fed.h b/sys/arch/i386/isa/pcvt/Util/fed/fed.h
index 27a32c35526..96eb1d7a2e0 100644
--- a/sys/arch/i386/isa/pcvt/Util/fed/fed.h
+++ b/sys/arch/i386/isa/pcvt/Util/fed/fed.h
@@ -32,7 +32,7 @@
  * 	fed.h, 3.00, last edit-date: [Sun Jan  2 20:10:31 1994]
  */
 
-#include <ncurses.h>
+#include <curses.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile b/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
index be63fb8212d..606dedc9196 100644
--- a/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
@@ -2,4 +2,3 @@ PROG=		fontedit
 CLEANFILES+=	core.fontedit fontedit.core
 
 .include <bsd.prog.mk>
-
diff --git a/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile b/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile
index a1391d03f39..a5a5cefeeb8 100644
--- a/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile
@@ -2,5 +2,3 @@ PROG=	ispcvt
 MAN8=	ispcvt.${MAN8EXT}
 
 .include <bsd.prog.mk>
-
-BINDIR=	/usr/sbin
-- 
cgit v1.2.3