From daf2519ea2f4d3a1e397188d25f7f0a5377e6521 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Sun, 9 Jul 2023 18:49:28 +0100 Subject: [PATCH] geom: Migrate from COMPAT_32BIT to generic COMPAT_libcompat See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: imp, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40927 --- lib/geom/Makefile.classes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/geom/Makefile.classes b/lib/geom/Makefile.classes index d4e6f52e65a..e6ac93294e1 100644 --- a/lib/geom/Makefile.classes +++ b/lib/geom/Makefile.classes @@ -1,9 +1,9 @@ # $FreeBSD$ -.if !defined(COMPAT_32BIT) +.if !defined(COMPAT_libcompat) GEOM_CLASS_DIR?=/lib/geom .else -GEOM_CLASS_DIR?=/usr/lib32/geom +GEOM_CLASS_DIR?=/usr/lib${COMPAT_libcompat}/geom .endif GEOM_CLASSES= cache