Kernel header installation should respect --prefix

This is the upstream component of work that enables preliminary support
for building Gentoo's ZFS packaging on other Linux systems via Gentoo
Prefix.

Signed-off-by: Richard Yao <richard.yao@clusterhq.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #384
This commit is contained in:
Richard Yao 2014-08-29 11:12:47 -04:00 committed by Brian Behlendorf
parent ad9863e80b
commit fd05dde75d
12 changed files with 13 additions and 13 deletions

View File

@ -12,10 +12,10 @@ endif
if CONFIG_KERNEL if CONFIG_KERNEL
SUBDIRS += module SUBDIRS += module
extradir = /usr/src/spl-$(VERSION) extradir = @prefix@/src/spl-$(VERSION)
extra_HEADERS = spl.release.in spl_config.h.in extra_HEADERS = spl.release.in spl_config.h.in
kerneldir = /usr/src/spl-$(VERSION)/$(LINUX_VERSION) kerneldir = @prefix@/src/spl-$(VERSION)/$(LINUX_VERSION)
nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS) nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
endif endif

View File

@ -15,6 +15,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include kerneldir = @prefix@/src/spl-$(VERSION)/include
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/fs kerneldir = @prefix@/src/spl-$(VERSION)/include/fs
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -19,6 +19,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/linux kerneldir = @prefix@/src/spl-$(VERSION)/include/linux
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -9,6 +9,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/rpc kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/sharefs kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -104,7 +104,7 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/sys kerneldir = @prefix@/src/spl-$(VERSION)/include/sys
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -9,6 +9,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -8,6 +8,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -9,6 +9,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/util kerneldir = @prefix@/src/spl-$(VERSION)/include/util
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif

View File

@ -10,6 +10,6 @@ USER_H =
EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/spl-$(VERSION)/include/vm kerneldir = @prefix@/src/spl-$(VERSION)/include/vm
kernel_HEADERS = $(KERNEL_H) kernel_HEADERS = $(KERNEL_H)
endif endif