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

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>
Issue #2641
This commit is contained in:
Richard Yao 2014-08-29 11:53:09 -04:00 committed by Brian Behlendorf
parent ed6e9cc235
commit 3cd33ffc3b
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

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

2
include/Makefile.am
View File

@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include kerneldir = @prefix@/src/zfs-$(VERSION)/include
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

2
include/linux/Makefile.am
View File

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

2
include/sys/Makefile.am
View File

@ -99,6 +99,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include/sys kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

2
include/sys/fm/Makefile.am
View File

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

2
include/sys/fm/fs/Makefile.am
View File

@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm/fs kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H) kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif endif

2
include/sys/fs/Makefile.am
View File

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