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

diff --git a/Makefile.am b/Makefile.am
index 23dc2572abf8e8977d433dd7294b7b63544a4df1..89af931ae4fa7f732ef5aa6720473ab87d3b3c74 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,10 +12,10 @@ endif
 if CONFIG_KERNEL
 SUBDIRS += module
 
-extradir = /usr/src/spl-$(VERSION)
+extradir = @prefix@/src/spl-$(VERSION)
 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)
 endif
 

diff --git a/include/Makefile.am b/include/Makefile.am
index a7508fb34ebd359146655e50c7f0d90b878ef945..f9b812de38d0df0f090ff49fa9b4e032e5261c13 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -15,6 +15,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include
+kerneldir = @prefix@/src/spl-$(VERSION)/include
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am
index 530172ddc85043bcfbcc488459052323d1a4f3a8..e0da4b32ab2362155119753cece43a645f26eae6 100644 (file)
--- a/include/fs/Makefile.am
+++ b/include/fs/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/fs
+kerneldir = @prefix@/src/spl-$(VERSION)/include/fs
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index 42215949737a3f33791d27e3ba872496cd46538b..1cca44a2bbffd37f0a5e2f06c982b7d6ef530701 100644 (file)
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -19,6 +19,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/linux
+kerneldir = @prefix@/src/spl-$(VERSION)/include/linux
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am
index 2f8aa29ddea55911a8efaaedd463551867beee6f..cfc824685dae2b4a84fb9eb9308987b2a3a8e728 100644 (file)
--- a/include/rpc/Makefile.am
+++ b/include/rpc/Makefile.am
@@ -9,6 +9,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/rpc
+kerneldir = @prefix@/src/spl-$(VERSION)/include/rpc
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am
index d6175a5022fbe58171a5cf78433052144b2be6cb..10e709325daa22023ab1bdaec35b82f91393c27a 100644 (file)
--- a/include/sharefs/Makefile.am
+++ b/include/sharefs/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/sharefs
+kerneldir = @prefix@/src/spl-$(VERSION)/include/sharefs
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index 985c513193ed8e8beb92e1a55fe9f98312681068..2d21c57287183676095ff4c4645412a15f8a81c1 100644 (file)
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -104,7 +104,7 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/sys
+kerneldir = @prefix@/src/spl-$(VERSION)/include/sys
 kernel_HEADERS = $(KERNEL_H)
 endif
 

diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
index 1c9cf8416948ccf54bc334fce3a19c3442fca374..2821cbe33390bf44a3d551817559481b242ee881 100644 (file)
--- a/include/sys/fm/Makefile.am
+++ b/include/sys/fm/Makefile.am
@@ -9,6 +9,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm
+kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fm
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
index 27ae109884ec66e144889647b8843e0004f1ecab..581083e9c545bbd69cdb6e4405bf332b9a20d817 100644 (file)
--- a/include/sys/fs/Makefile.am
+++ b/include/sys/fs/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs
+kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/fs
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
index bf395eb2d365d0e9847a26c970ab112540cdb894..63d9af310f2664445d917678ae02deb2dcab44a9 100644 (file)
--- a/include/sys/sysevent/Makefile.am
+++ b/include/sys/sysevent/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent
+kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/util/Makefile.am b/include/util/Makefile.am
index 5ac96e8cc7c508db03e4d8bbc33a843085779310..b721b5099cf7eb86b777a108ae3bfb8050491787 100644 (file)
--- a/include/util/Makefile.am
+++ b/include/util/Makefile.am
@@ -9,6 +9,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/util
+kerneldir = @prefix@/src/spl-$(VERSION)/include/util
 kernel_HEADERS = $(KERNEL_H)
 endif

diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am
index 413a6e325b47c696a4fca46786ea0b71540a3328..7faab0aab7f98e8f0ee57e369383b908b89e1584 100644 (file)
--- a/include/vm/Makefile.am
+++ b/include/vm/Makefile.am
@@ -10,6 +10,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(VERSION)/include/vm
+kerneldir = @prefix@/src/spl-$(VERSION)/include/vm
 kernel_HEADERS = $(KERNEL_H)
 endif