aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2023-08-01 14:11:23 +0000
committerMark Johnston <markj@FreeBSD.org>2023-08-01 14:11:42 +0000
commit848ff9bc1b97b04a0b7328ec7079fb031fef452d (patch)
tree7d21578ec725c11e959cfc1af156d1adfea4e7e8
parentd0e4e53ebd6499d420c19426586eeeafec157150 (diff)
downloadsrc-848ff9bc1b97b04a0b7328ec7079fb031fef452d.tar.gz
src-848ff9bc1b97b04a0b7328ec7079fb031fef452d.zip
libdtrace: Explicitly set SHLIBDIR and SHLIB_MAJOR
They were previously being defined by cddl/lib/Makefile.inc, and as of commit 4ae699122810 were being overridden by defaults in bsd.own.mk, which changed SHLIBDIR to /usr/lib. Reported by: Domagoj Stolfa <ds815@cam.ac.uk> Fixes: 4ae699122810 ("dtrace: Add WITH_DTRACE_ASAN")
-rw-r--r--cddl/lib/libdtrace/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index a6a7b90d3d39..d6771aee37b6 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -7,6 +7,10 @@
PACKAGE= dtrace
LIB= dtrace
+
+SHLIBDIR= /lib
+SHLIB_MAJOR= 2
+
SRCS= dt_aggregate.c \
dt_as.c \
dt_buf.c \