testsuite: correct the default KDIR

Honor the user-provided module directory. At the moment things work,
because distros have compatibility /lib -> /usr/lib symlink.

While in there, avoid the use of deprecated backtick (shell) notation.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/86
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index cc23aaa322ca433aaf698892be5d1944ad2aec5e..543c74f1cfac1443cae00639ac36b77d6461b434 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -176,7 +176,7 @@ build-module-playground:
                mkdir -p testsuite/ && \
                cp -r $(top_srcdir)/$(MODULE_PLAYGROUND) $(top_builddir)/$(MODULE_PLAYGROUND); \
                fi
-       $(MAKE) -C $(MODULE_PLAYGROUND)
+       MODULE_DIRECTORY=$(module_directory) $(MAKE) -C $(MODULE_PLAYGROUND)
 
 
 rootfs: build-module-playground

diff --git a/testsuite/module-playground/Makefile b/testsuite/module-playground/Makefile
index 4469c97cebd840c0167bc3b193cdbf7a2ab1e98f..b9d9e1f44aec8cbf33c8375b2ca87931a361f2d8 100644 (file)
--- a/testsuite/module-playground/Makefile
+++ b/testsuite/module-playground/Makefile
@@ -1,4 +1,4 @@
-KDIR ?= $(module_prefix)/lib/modules/`uname -r`/build
+KDIR ?= $(MODULE_DIRECTORY)/$$(uname -r)/build
 
 ARCH_SPECIFIC_MODULES := mod-simple-x86_64.ko mod-simple-i386.ko mod-simple-sparc64.ko