diff options
| author | Richard Yao <[email protected]> | 2014-08-29 11:53:09 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-10-28 09:37:06 -0700 |
| commit | 3cd33ffc3ba1ebbc90eab280d87d6ac096be92f9 (patch) | |
| tree | 7266ac8315ac1e9b674429e2014175a217872691 | |
| parent | ed6e9cc235b47b5c940178926715f871bd36dc5e (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]>
Issue #2641
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/linux/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/fm/fs/Makefile.am | 2 | ||||
| -rw-r--r-- | include/sys/fs/Makefile.am | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 5f0ee6453..49b417a81 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 2e1c31aaf..a94cad50d 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 fc2df090e..d00b1c8ad 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 8f01660cb..a755b394d 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 4dc58945d..8bca5d846 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 76b525fe6..fdc9eb545 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 c9fdf128d..0859b9f67 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 |