From bf3aa3662dff7ba07277398d53da6eb476387df1 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 20 May 2004 14:59:41 +0000
Subject: [PATCH] Fix supposed compilation problem, using LIBDIR here can
 confuse core/ compilation.

---
 sbin/geom/Makefile.inc       | 2 +-
 sbin/geom/class/Makefile.inc | 1 +
 sbin/geom/core/Makefile      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc
index 7803210e1e71..703f7013fe76 100644
--- 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
diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index b927bca57ac8..5fbe1f52bbd6 100644
--- 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
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index 3c373429fb25..e65c99d4015c 100644
--- 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>