From dde3db2717fadcc7361a423ddc862f9f4e08de79 Mon Sep 17 00:00:00 2001
From: frueauf <frueauf>
Date: Tue, 5 May 1998 13:12:16 +0000
Subject: Comment out SUBDIR+=cvs-current until we have a CONFLICTS feature.
 This way cvs and cvs-current don't conflict by default.

---
 devel/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'devel')

diff --git a/devel/Makefile b/devel/Makefile
index c3f8940b985..aa7fed7c8d7 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1998/05/03 21:25:59 frueauf Exp $
+# $NetBSD: Makefile,v 1.21 1998/05/05 13:12:16 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.78 1997/10/01 08:32:59 cracauer Exp
 #
 
@@ -17,7 +17,9 @@
 #    SUBDIR += cs
 #    SUBDIR += cutils
     SUBDIR += cvs
-    SUBDIR += cvs-current
+#    SUBDIR += cvs-current	# don't enable this by default unless we
+				# have a CONFLICTS feature (installs same
+				# files like cvs).
 #    SUBDIR += cxref
 #    SUBDIR += ddd
 #    SUBDIR += dmake
-- 
cgit v1.2.3