X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=include%2Fsys%2FMakefile.am;h=083e1217b50421c5a96bb099bc587736a5a26cbb;hb=b40a77aefca3d0832396edd35f597100d152f163;hp=a2e8dd01b101a93bd0cdd26803b17d503a5620c5;hpb=590329b50cda53cad87a4222d55cdbb35bfcf494;p=zfs.git

diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index a2e8dd0..083e121 100644
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -49,12 +49,12 @@ 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 \
@@ -73,9 +73,9 @@ 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 \
 	$(top_srcdir)/include/sys/zvol.h
 
 USER_H =
@@ -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