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

diff --git a/Makefile.am b/Makefile.am
index 5f0ee6453dcb2e34ca8493741fb6b6c859f220d0..49b417a81d9e6ec5c090f37a6f9901e3d3d6eaf3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,10 @@ endif
 if CONFIG_KERNEL
 SUBDIRS += module
 
-extradir = /usr/src/zfs-$(VERSION)
+extradir = @prefix@/src/zfs-$(VERSION)
 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)
 endif
 

diff --git a/include/Makefile.am b/include/Makefile.am
index 2e1c31aaf81c3fbdf7163c1843fc7b196c5e143b..a94cad50da17016b087007e46319731da6034bdf 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
 endif
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(VERSION)/include
+kerneldir = @prefix@/src/zfs-$(VERSION)/include
 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
 endif

diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index fc2df090ef9de2a058fd7ec164fcf07144afea14..d00b1c8ad798c23b2642ce88be62555ccfb3bec7 100644 (file)
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
 endif
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(VERSION)/include/linux
+kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
 endif

diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index 8f01660cb3fd59c03474610be8982f8f2e7d9aaa..a755b394da9d6507d3237ef1cfb4f80d30218857 100644 (file)
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -99,6 +99,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
 endif
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(VERSION)/include/sys
+kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
 endif

diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
index 4dc58945d0e6aca2c8625bb7417cfc5446883251..8bca5d8468c0be05ef01c720e5cbfe8525748e2b 100644 (file)
--- a/include/sys/fm/Makefile.am
+++ b/include/sys/fm/Makefile.am
@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
 endif
 
 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)
 endif

diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
index 76b525fe68ef2dc374540cbde5a97c8fdc8c2aa2..fdc9eb5455f9c5633abbaa6ba91d61eb1a5dd141 100644 (file)
--- a/include/sys/fm/fs/Makefile.am
+++ b/include/sys/fm/fs/Makefile.am
@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
 endif
 
 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)
 endif

diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
index c9fdf128d7436a2b7e113c9e29d46cdc4ce455d8..0859b9f670dd6b55afb6018b24a74c7fafe017a4 100644 (file)
--- a/include/sys/fs/Makefile.am
+++ b/include/sys/fs/Makefile.am
@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
 endif
 
 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)
 endif