Permalink
Browse files

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>
  • Loading branch information...
1 parent 8780c53 commit fd7fd5ebcf6cceb107dd27592a9bd7d60f93738f @ryao ryao committed with Dec 16, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 Makefile.am
View
@@ -3,13 +3,13 @@ include $(top_srcdir)/config/deb.am
include $(top_srcdir)/config/tgz.am
include $(top_srcdir)/config/arch.am
+SUBDIRS = include
if CONFIG_USER
-USER_DIR = dracut udev etc man scripts lib cmd
+SUBDIRS += dracut udev etc man scripts lib cmd
endif
if CONFIG_KERNEL
-KERNEL_DIR = module
+SUBDIRS += module
endif
-SUBDIRS = $(USER_DIR) $(KERNEL_DIR) include
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in

0 comments on commit fd7fd5e

Please sign in to comment.