Rename the generic "CLASS" to the more specific "GEOM_CLASS".

While I'm here remove redundancy and inconsistencies.

Obtained from: Juniper Networks

4 files changed, 3 insertions, 4 deletions

diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc
index bf9f05e..0b1f991 100644
--- a/sbin/geom/Makefile.inc
+++ b/sbin/geom/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-CLASS_DIR?=/lib/geom
+GEOM_CLASS_DIR?=/lib/geom
 
 .include "../Makefile.inc"
diff --git a/sbin/geom/class/sched/Makefile b/sbin/geom/class/sched/Makefile
index abb47dc..a6ccd58 100644
--- a/sbin/geom/class/sched/Makefile
+++ b/sbin/geom/class/sched/Makefile
@@ -6,6 +6,5 @@
 GEOM_CLASS=	sched
 
 WARNS?=	6
-CLASS_DIR?=/lib/geom
 
 .include <bsd.lib.mk>
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index d76c35b..64edc79 100644
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@@ -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}
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index 0a583ef..a802915 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -500,7 +500,7 @@ library_path(void)
 
 	path = getenv("GEOM_LIBRARY_PATH");
 	if (path == NULL)
-		path = CLASS_DIR;
+		path = GEOM_CLASS_DIR;
 	return (path);
 }