]> git.proxmox.com Git - mirror_spl.git/commitdiff
Linux 5.0 compat: Fix SUBDIRs
authorTony Hutter <hutter2@llnl.gov>
Tue, 29 Jan 2019 00:58:43 +0000 (16:58 -0800)
committerTony Hutter <hutter2@llnl.gov>
Fri, 22 Feb 2019 17:47:27 +0000 (09:47 -0800)
(This is the SPL port of this patch)

SUBDIRs has been deprecated for a long time, and was finally removed in
the 5.0 kernel.  Use "M=" instead.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #8257

module/Makefile.in

index d4e62e152193c28eb3afd65a3249e74cf229b65e..845a5e32d371271225729a4660b7a8eb330b742a 100644 (file)
@@ -8,19 +8,19 @@ SPL_MODULE_CFLAGS += -include @abs_top_builddir@/spl_config.h
 export SPL_MODULE_CFLAGS
 
 modules:
-       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_SPL=m $@
+       $(MAKE) -C @LINUX_OBJ@ M=`pwd` @KERNELMAKE_PARAMS@ CONFIG_SPL=m $@
 
 clean:
        @# Only cleanup the kernel build directories when CONFIG_KERNEL
        @# is defined.  This indicates that kernel modules should be built.
-@CONFIG_KERNEL_TRUE@   $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
+@CONFIG_KERNEL_TRUE@   $(MAKE) -C @LINUX_OBJ@ M=`pwd` @KERNELMAKE_PARAMS@ $@
 
        if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi
        if [ -f Module.markers ]; then $(RM) Module.markers; fi
 
 modules_install:
        @# Install the kernel modules
-       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
+       $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \
                INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
                INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
                KERNELRELEASE=@LINUX_VERSION@