Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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>
This commit is contained in:
Richard Yao 2012-12-16 00:35:16 -05:00 committed by Brian Behlendorf
parent 8780c53961
commit fd7fd5ebcf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -3,13 +3,13 @@ include $(top_srcdir)/config/deb.am
include $(top_srcdir)/config/tgz.am include $(top_srcdir)/config/tgz.am
include $(top_srcdir)/config/arch.am include $(top_srcdir)/config/arch.am
SUBDIRS = include
if CONFIG_USER if CONFIG_USER
USER_DIR = dracut udev etc man scripts lib cmd SUBDIRS += dracut udev etc man scripts lib cmd
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
KERNEL_DIR = module SUBDIRS += module
endif endif
SUBDIRS = $(USER_DIR) $(KERNEL_DIR) include
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in