From 3cd33ffc3ba1ebbc90eab280d87d6ac096be92f9 Mon Sep 17 00:00:00 2001
From: Richard Yao <richard.yao@clusterhq.com>
Date: Fri, 29 Aug 2014 11:53:09 -0400
Subject: [PATCH] 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
---
 Makefile.am                   | 4 ++--
 include/Makefile.am           | 2 +-
 include/linux/Makefile.am     | 2 +-
 include/sys/Makefile.am       | 2 +-
 include/sys/fm/Makefile.am    | 2 +-
 include/sys/fm/fs/Makefile.am | 2 +-
 include/sys/fs/Makefile.am    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5f0ee6453d..49b417a81d 100644
--- 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 2e1c31aaf8..a94cad50da 100644
--- 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 fc2df090ef..d00b1c8ad7 100644
--- 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 8f01660cb3..a755b394da 100644
--- 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 4dc58945d0..8bca5d8468 100644
--- 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 76b525fe68..fdc9eb5455 100644
--- 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 c9fdf128d7..0859b9f670 100644
--- 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