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); } _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"