Do not use KERNEL_DIR env var in Makefile.am

A Gentoo user reported an issue where the build system would
attempt to recurse into the kernel source tree if KERNEL_DIR
is set in the environment. KERNEL_DIR is an environment variable
that is used when the kernel sources are in a non-standard
location, so it is necessary to stop relying on it to prevent
this issue.

https://bugs.gentoo.org/show_bug.cgi?id=433946

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/Makefile.am b/Makefile.am
index 6000a7d14731e035a739dfd2ef6c14aa977c56b6..74c292093e012b43ed2d2193ab38dae917005c63 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,13 @@ include $(top_srcdir)/config/deb.am
 include $(top_srcdir)/config/tgz.am
 include $(top_srcdir)/config/arch.am
 
+SUBDIRS =
 if CONFIG_USER
-USER_DIR = lib cmd scripts
+SUBDIRS += lib cmd scripts
 endif
 if CONFIG_KERNEL
-KERNEL_DIR = module include
+SUBDIRS += module include
 endif
-SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST  = autogen.sh spl.spec.in spl-modules.spec.in META DISCLAIMER