summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2004-05-20 14:59:41 +0000
committerpjd <pjd@FreeBSD.org>2004-05-20 14:59:41 +0000
commit8bae9ba9b3e6ce9ef180784558a104b3fa7ad036 (patch)
tree83a7e881ecd21e79bfcdd0cffae2a5cd55f447b0 /sbin
parent1c76db064ed97459a91cdeffc38dfd6592791c55 (diff)
downloadFreeBSD-src-8bae9ba9b3e6ce9ef180784558a104b3fa7ad036.zip
FreeBSD-src-8bae9ba9b3e6ce9ef180784558a104b3fa7ad036.tar.gz
Fix supposed compilation problem, using LIBDIR here can confuse core/
compilation.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/geom/Makefile.inc2
-rw-r--r--sbin/geom/class/Makefile.inc1
-rw-r--r--sbin/geom/core/Makefile2
3 files changed, 3 insertions, 2 deletions
diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc
index 7803210..703f701 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 b927bca..5fbe1f5 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 3c37342..e65c99d 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>
OpenPOWER on IntegriCloud