From: Emil Velikov Date: Thu, 22 Aug 2024 16:04:21 +0000 (+0100) Subject: build: set OVERRIDE_LIBDIR in the build system X-Git-Tag: v34~480 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e13674d075fb6a7ffbcba0f842229b615b89fb80;p=thirdparty%2Fkmod.git build: set OVERRIDE_LIBDIR in the build system The path is build-system specific, so set it there. Shortly we'll be adding a meson build, where the value will be different. Signed-off-by: Emil Velikov Reviewed-by: Lucas De Marchi Link: https://github.com/kmod-project/kmod/pull/86 Signed-off-by: Lucas De Marchi --- diff --git a/Makefile.am b/Makefile.am index 4d8fa74a..370332f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -244,7 +244,8 @@ testsuite_init_module_la_LIBADD = libkmod/libkmod-internal.la TESTSUITE_CPPFLAGS = $(AM_CPPFLAGS) \ -DTESTSUITE_ROOTFS=\"$(abs_top_builddir)/$(ROOTFS)/\" \ - -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" + -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" \ + -DOVERRIDE_LIBDIR=\"$(abs_top_builddir)/testsuite/.libs/\" TESTSUITE_LDADD = \ testsuite/libtestsuite.la libkmod/libkmod-internal.la \ shared/libshared.la diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c index c1a74a75..b08473d4 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c @@ -39,7 +39,6 @@ static const struct option options[] = { { NULL, 0, 0, 0 } }; -#define OVERRIDE_LIBDIR ABS_TOP_BUILDDIR "/testsuite/.libs/" #define TEST_TIMEOUT_USEC 2 * USEC_PER_SEC static const struct {