Fix supposed compilation problem, using LIBDIR here can confuse core/

compilation.
2004-05-20 14:59:41 +00:00 · 2004-05-20 14:59:41 +00:00 · 8bae9ba9b3
commit 8bae9ba9b3
parent 1c76db064e
3 changed files with 3 additions and 2 deletions
--- a/sbin/geom/Makefile.inc
+++ b/sbin/geom/Makefile.inc
@ -1,5 +1,5 @@
 # $FreeBSD$

 BINDIR?=/sbin
-LIBDIR?=/lib/geom
+CLASSDIR?=/lib/geom
 WARNS?=	6
--- a/sbin/geom/class/Makefile.inc
+++ b/sbin/geom/class/Makefile.inc
@ -2,6 +2,7 @@

 .include "../Makefile.inc"

+LIBDIR?=${CLASSDIR}
 SHLIB_MAJOR=1

 SRCS=   geom_${CLASS}.c subr.c
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@ -10,6 +10,6 @@ DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML}
 LDADD=	-lgeom -lsbuf -lbsdxml
 WARNS?=	6
 CFLAGS+=-I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
-CFLAGS+=-DCLASSDIR=\"${LIBDIR}\"
+CFLAGS+=-DCLASSDIR=\"${CLASSDIR}\"

 .include <bsd.prog.mk>