diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/Makefile.am | 2 | ||||
-rw-r--r-- | include/Makefile.in | 2 | ||||
-rw-r--r-- | include/linux/Makefile.am | 2 | ||||
-rw-r--r-- | include/linux/Makefile.in | 2 | ||||
-rw-r--r-- | include/sys/Makefile.am | 2 | ||||
-rw-r--r-- | include/sys/Makefile.in | 2 | ||||
-rw-r--r-- | include/sys/fm/Makefile.am | 2 | ||||
-rw-r--r-- | include/sys/fm/Makefile.in | 2 | ||||
-rw-r--r-- | include/sys/fm/fs/Makefile.am | 2 | ||||
-rw-r--r-- | include/sys/fm/fs/Makefile.in | 2 | ||||
-rw-r--r-- | include/sys/fs/Makefile.am | 2 | ||||
-rw-r--r-- | include/sys/fs/Makefile.in | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 1d7493bb5..8f9c8d729 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -27,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif if CONFIG_KERNEL -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION) +kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/include/Makefile.in b/include/Makefile.in index 18e235722..ec15bcfa3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -382,7 +382,7 @@ USER_H = \ EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION) +@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) all: all-recursive diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am index 44ffb411f..6e481a136 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am @@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif if CONFIG_KERNEL -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/linux +kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/include/linux/Makefile.in b/include/linux/Makefile.in index 030437b44..0d6d17e09 100644 --- a/include/linux/Makefile.in +++ b/include/linux/Makefile.in @@ -317,7 +317,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/linux +@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) all: all-am diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index 24cc0dfe1..083e1217b 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -88,6 +88,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H) endif if CONFIG_KERNEL -kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys +kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in index 012ffe9f7..21892116f 100644 --- a/include/sys/Makefile.in +++ b/include/sys/Makefile.in @@ -567,7 +567,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys +@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) all: all-recursive diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am index 91b3d7b8a..900ed9310 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)/$(LINUX_VERSION)/sys/fm +kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/include/sys/fm/Makefile.in b/include/sys/fm/Makefile.in index 932e5e732..fa7966a8d 100644 --- a/include/sys/fm/Makefile.in +++ b/include/sys/fm/Makefile.in @@ -354,7 +354,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fm +@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) all: all-recursive diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am index a296f1d93..d82d07612 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)/$(LINUX_VERSION)/sys/fm/fs +kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/include/sys/fm/fs/Makefile.in b/include/sys/fm/fs/Makefile.in index bbcb1c258..c9048db09 100644 --- a/include/sys/fm/fs/Makefile.in +++ b/include/sys/fm/fs/Makefile.in @@ -312,7 +312,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fm/fs +@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) all: all-am diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am index 3074f2fde..b702679a8 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)/$(LINUX_VERSION)/sys/fs +kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs kernel_HEADERS = $(COMMON_H) $(KERNEL_H) endif diff --git a/include/sys/fs/Makefile.in b/include/sys/fs/Makefile.in index da86a6fbc..dbd54a3d6 100644 --- a/include/sys/fs/Makefile.in +++ b/include/sys/fs/Makefile.in @@ -312,7 +312,7 @@ USER_H = EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)/sys/fs +@CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) all: all-am |