diff options
| author | Tony Hutter <[email protected]> | 2019-01-10 17:07:05 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-01-28 10:11:45 -0800 |
| commit | ed158b19b1dddf26f2bbebb4d0fd21f04fdd5d38 (patch) | |
| tree | 7ff55f390a2ded9316516a025c7428fe9ff6eb8a | |
| parent | 05805494dd7ea3b2fbb34ac031c338a8bc0bab62 (diff) | |
Linux 5.0 compat: Fix SUBDIRs
SUBDIRs has been deprecated for a long time, and was finally removed in
the 5.0 kernel. Use "M=" instead.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tony Hutter <[email protected]>
Closes #8257
| -rw-r--r-- | module/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/Makefile.in b/module/Makefile.in index 82d155dd3..935bd2663 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -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@ |