diff options
author | Brian Behlendorf <[email protected]> | 2013-02-21 15:10:11 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2013-03-13 13:42:16 -0700 |
commit | 775f2d34a3ccd5f866cfa04be76f83cb562f3881 (patch) | |
tree | 8bed94037a291b6cd2a2e40cb50bb9b28fb20e55 /include/sys | |
parent | d69b2dee714f732300c6db12b7af48b4f86d67ee (diff) |
Change zfs-kmod-devel install path
Install the common zfs kernel development headers under
/usr/src/zfs-<version>/ rather than in a kernel specific
directory. The kernel specific build products such as
zfs_config.h and Modules.symvers are left installed under
/usr/src/zfs-<version>/<kernel>.
This was done to be consistent with where dkms expects
kernel module source to be packaged. It also allows for
a common zfs-kmod-devel package which includes the headers,
and per-kernel zfs-kmod-devel-<kernel> packages.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include/sys')
-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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index a0cc9d1d6..2245ff445 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -91,6 +91,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif if CONFIG_KERNEL -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys +kerneldir = /usr/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 900ed9310..4dc58945d 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-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm +kerneldir = /usr/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 d82d07612..76b525fe6 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-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs +kerneldir = /usr/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 b702679a8..c9fdf128d 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-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs +kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fs kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif |