]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Linux 5.0 compat: Fix SUBDIRs
authorTony Hutter <hutter2@llnl.gov>
Fri, 11 Jan 2019 01:07:05 +0000 (17:07 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 28 Jan 2019 18:11:45 +0000 (10:11 -0800)
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 82d155dd31ac4341c5bb8cbfdc8867ffb09b8684..935bd26630625e598da67739e74d8b9079175ebf 100644 (file)
@@ -29,12 +29,12 @@ modules:
        list='$(SUBDIR_TARGETS)'; for targetdir in $$list; do \
                $(MAKE) -C $$targetdir; \
        done
-       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNEL_MAKE@ CONFIG_ZFS=m $@
+       $(MAKE) -C @LINUX_OBJ@ M=`pwd` @KERNEL_MAKE@ CONFIG_ZFS=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` @KERNEL_MAKE@ $@
+@CONFIG_KERNEL_TRUE@   $(MAKE) -C @LINUX_OBJ@ M=`pwd` @KERNEL_MAKE@ $@
 
        if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi
        if [ -f Module.markers ]; then $(RM) Module.markers; fi
@@ -43,7 +43,7 @@ clean:
 
 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@