From owner-svn-src-head@FreeBSD.ORG  Wed Dec 15 23:45:13 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D04FC1065673;
	Wed, 15 Dec 2010 23:45:13 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A46AC8FC14;
	Wed, 15 Dec 2010 23:45:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBFNjDPp000616;
	Wed, 15 Dec 2010 23:45:13 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBFNjDZK000611;
	Wed, 15 Dec 2010 23:45:13 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201012152345.oBFNjDZK000611@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 15 Dec 2010 23:45:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216470 - in head/sbin/geom: . class/sched core
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Dec 2010 23:45:13 -0000

Author: obrien
Date: Wed Dec 15 23:45:12 2010
New Revision: 216470
URL: http://svn.freebsd.org/changeset/base/216470

Log:
  Rename the generic "CLASS" to the more specific "GEOM_CLASS".
  While I'm here remove redundancy and inconsistencies.
  
  Obtained from: Juniper Networks

Modified:
  head/sbin/geom/Makefile.inc
  head/sbin/geom/class/sched/Makefile
  head/sbin/geom/core/Makefile
  head/sbin/geom/core/geom.c

Modified: head/sbin/geom/Makefile.inc
==============================================================================
--- head/sbin/geom/Makefile.inc	Wed Dec 15 23:43:25 2010	(r216469)
+++ head/sbin/geom/Makefile.inc	Wed Dec 15 23:45:12 2010	(r216470)
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-CLASS_DIR?=/lib/geom
+GEOM_CLASS_DIR?=/lib/geom
 
 .include "../Makefile.inc"

Modified: head/sbin/geom/class/sched/Makefile
==============================================================================
--- head/sbin/geom/class/sched/Makefile	Wed Dec 15 23:43:25 2010	(r216469)
+++ head/sbin/geom/class/sched/Makefile	Wed Dec 15 23:45:12 2010	(r216470)
@@ -6,6 +6,5 @@
 GEOM_CLASS=	sched
 
 WARNS?=	6
-CLASS_DIR?=/lib/geom
 
 .include <bsd.lib.mk>

Modified: head/sbin/geom/core/Makefile
==============================================================================
--- head/sbin/geom/core/Makefile	Wed Dec 15 23:43:25 2010	(r216469)
+++ head/sbin/geom/core/Makefile	Wed Dec 15 23:45:12 2010	(r216470)
@@ -8,7 +8,7 @@ SRCS=	geom.c subr.c
 
 NO_SHARED=NO
 
-CFLAGS+= -DCLASS_DIR=\"${CLASS_DIR}\"
+CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\"
 CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
 
 DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}

Modified: head/sbin/geom/core/geom.c
==============================================================================
--- head/sbin/geom/core/geom.c	Wed Dec 15 23:43:25 2010	(r216469)
+++ head/sbin/geom/core/geom.c	Wed Dec 15 23:45:12 2010	(r216470)
@@ -500,7 +500,7 @@ library_path(void)
 
 	path = getenv("GEOM_LIBRARY_PATH");
 	if (path == NULL)
-		path = CLASS_DIR;
+		path = GEOM_CLASS_DIR;
 	return (path);
 }