From 684dcece3645ebafe7bfe6e4585f61362321262f Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Mon, 28 Dec 1998 16:32:39 +0000
Subject: Tweaks as a result of having vinum statically buildable in a kernel.

---
 sbin/vinum/Makefile   | 6 +++---
 sbin/vinum/commands.c | 4 ++--
 sbin/vinum/list.c     | 6 +++---
 sbin/vinum/v.c        | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sbin/vinum/Makefile b/sbin/vinum/Makefile
index 0c421e6..23559d5 100644
--- a/sbin/vinum/Makefile
+++ b/sbin/vinum/Makefile
@@ -1,10 +1,10 @@
-#	$Id: Makefile,v 1.2 1998/10/17 13:48:37 bde Exp $
+#	$Id: Makefile,v 1.3 1998/12/28 11:06:21 sos Exp $
 
 PROG=	vinum
-SRCS=	v.c list.c parser.c util.c vext.h commands.c
+SRCS=	v.c list.c vinumparser.c vinumutil.c vext.h commands.c
 MAN8=	vinum.8
 
-CFLAGS+=	-I${.CURDIR}/../../sys/dev/vinum -g -Wall -DDEBUG -DRAID5
+CFLAGS+=	-I${.CURDIR}/../../sys -g -Wall -DVINUMDEBUG -DRAID5
 DPADD=		${LIBUTIL} ${LIBREADLINE} ${LIBTERMCAP}
 LDADD=		-lutil -lreadline -ltermcap
 BINGRP=		kmem
diff --git a/sbin/vinum/commands.c b/sbin/vinum/commands.c
index 374e5d2..a41ea97 100644
--- a/sbin/vinum/commands.c
+++ b/sbin/vinum/commands.c
@@ -36,7 +36,7 @@
  *
  */
 
-/* $Id: commands.c,v 1.3 1998/10/27 06:10:45 grog Exp grog $ */
+/* $Id: commands.c,v 1.2 1998/11/02 04:12:28 grog Exp $ */
 
 #include <ctype.h>
 #include <errno.h>
@@ -51,7 +51,7 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include "vinumhdr.h"
+#include <dev/vinum/vinumhdr.h>
 #include "vext.h"
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/sbin/vinum/list.c b/sbin/vinum/list.c
index 4b6a634..b5b2cc6 100644
--- a/sbin/vinum/list.c
+++ b/sbin/vinum/list.c
@@ -35,7 +35,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: list.c,v 1.13 1998/09/04 05:58:19 grog Exp grog $
+ * $Id: list.c,v 1.5 1998/11/03 06:39:39 grog Exp $
  */
 
 #include <ctype.h>
@@ -50,9 +50,9 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
-#include "vinumhdr.h"
+#include <dev/vinum/vinumhdr.h>
 #include "vext.h"
-#include "request.h"
+#include <dev/vinum/request.h>
 /* Take a size in sectors and return a pointer to a
  * string which represents the size best.
  * If lj is != 0, return left justified, otherwise
diff --git a/sbin/vinum/v.c b/sbin/vinum/v.c
index 8ae420d..a05df74 100644
--- a/sbin/vinum/v.c
+++ b/sbin/vinum/v.c
@@ -36,7 +36,7 @@
  *
  */
 
-/* $Id: v.c,v 1.22 1998/08/11 07:44:54 grog Exp grog $ */
+/* $Id: v.c,v 1.1.1.1 1998/09/16 05:57:36 grog Exp $ */
 
 #include <ctype.h>
 #include <errno.h>
@@ -51,7 +51,7 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
-#include "vinumhdr.h"
+#include <dev/vinum/vinumhdr.h>
 #include "vext.h"
 #include <sys/types.h>
 #include <sys/wait.h>
-- 
cgit v1.1