]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
build: set OVERRIDE_LIBDIR in the build system
authorEmil Velikov <emil.l.velikov@gmail.com>
Thu, 22 Aug 2024 16:04:21 +0000 (17:04 +0100)
committerLucas De Marchi <lucas.de.marchi@gmail.com>
Fri, 23 Aug 2024 18:51:19 +0000 (13:51 -0500)
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 <emil.l.velikov@gmail.com>
Reviewed-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/86
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Makefile.am
testsuite/testsuite.c

index 4d8fa74aa2624e0d8b7089672d024111797d7914..370332f512853c328d10a743466ece3724db5dcb 100644 (file)
@@ -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
index c1a74a751c9d2eedae07e3d87a6b39d209980073..b08473d480fa1eec3a6a6475eb5d8f62948fda56 100644 (file)
@@ -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 {