diff options
author | Richard Yao <[email protected]> | 2014-08-29 11:12:47 -0400 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2014-10-28 09:31:48 -0700 |
commit | fd05dde75d1abbb3dd906f9efa298b12ffc9d7d7 (patch) | |
tree | 5b9d06f79bfe9bb82c9e01203d6377ce163a5411 | |
parent | ad9863e80be35825229d0638c5e69c0ea30f82de (diff) |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #384
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | include/Makefile.am | 2 | ||||
-rw-r--r-- | include/fs/Makefile.am | 2 | ||||
-rw-r--r-- | include/linux/Makefile.am | 2 | ||||
-rw-r--r-- | include/rpc/Makefile.am | 2 | ||||
-rw-r--r-- | include/sharefs/Makefile.am | 2 | ||||
-rw-r--r-- | include/sys/Makefile.am | 2 | ||||
-rw-r--r-- | include/sys/fm/Makefile.am | 2 | ||||
-rw-r--r-- | include/sys/fs/Makefile.am | 2 | ||||
-rw-r--r-- | include/sys/sysevent/Makefile.am | 2 | ||||
-rw-r--r-- | include/util/Makefile.am | 2 | ||||
-rw-r--r-- | include/vm/Makefile.am | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 23dc2572a..89af931ae 100644 --- 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 a7508fb34..f9b812de3 100644 --- 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 530172ddc..e0da4b32a 100644 --- 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 422159497..1cca44a2b 100644 --- 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 2f8aa29dd..cfc824685 100644 --- 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 d6175a502..10e709325 100644 --- 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 985c51319..2d21c5728 100644 --- 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 1c9cf8416..2821cbe33 100644 --- 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 27ae10988..581083e9c 100644 --- 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 bf395eb2d..63d9af310 100644 --- 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 5ac96e8cc..b721b5099 100644 --- 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 413a6e325..7faab0aab 100644 --- 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 |