Illumos #1949, #1953

[zfs.git] / include / sys / Makefile.am

diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index bde71b7..651e68b 100644 (file)
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -49,11 +49,13 @@ COMMON_H = \
        $(top_srcdir)/include/sys/vdev_file.h \
        $(top_srcdir)/include/sys/vdev.h \
        $(top_srcdir)/include/sys/vdev_impl.h \
+       $(top_srcdir)/include/sys/xvattr.h \
        $(top_srcdir)/include/sys/zap.h \
        $(top_srcdir)/include/sys/zap_impl.h \
        $(top_srcdir)/include/sys/zap_leaf.h \
        $(top_srcdir)/include/sys/zfs_acl.h \
        $(top_srcdir)/include/sys/zfs_context.h \
+       $(top_srcdir)/include/sys/zfs_ctldir.h \
        $(top_srcdir)/include/sys/zfs_debug.h \
        $(top_srcdir)/include/sys/zfs_dir.h \
        $(top_srcdir)/include/sys/zfs_fuid.h \
@@ -72,7 +74,6 @@ COMMON_H = \
        $(top_srcdir)/include/sys/zrlock.h
 
 KERNEL_H = \
-       $(top_srcdir)/include/sys/blkdev.h \
        $(top_srcdir)/include/sys/zfs_ioctl.h \
        $(top_srcdir)/include/sys/zfs_onexit.h \
        ${top_srcdir}/include/sys/zpl.h \
@@ -88,6 +89,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