From 775f2d34a3ccd5f866cfa04be76f83cb562f3881 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 21 Feb 2013 15:10:11 -0800 Subject: Change zfs-kmod-devel install path Install the common zfs kernel development headers under /usr/src/zfs-/ 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-/. 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- packages. Signed-off-by: Brian Behlendorf --- include/sys/fm/Makefile.am | 2 +- include/sys/fm/fs/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include/sys/fm') 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 -- cgit v1.2.3