Merge tag 'upstream/0.7.5'

[mirror_zfs-debian.git] / include / Makefile.am

diff --git a/include/Makefile.am b/include/Makefile.am
index 8f9c8d7292d7b660301e390428f1903157380d35..a94cad50da17016b087007e46319731da6034bdf 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = linux sys
 
 COMMON_H = \
+       $(top_srcdir)/include/zfeature_common.h \
        $(top_srcdir)/include/zfs_comutil.h \
        $(top_srcdir)/include/zfs_deleg.h \
        $(top_srcdir)/include/zfs_fletcher.h \
@@ -17,6 +18,7 @@ USER_H = \
        $(top_srcdir)/include/libuutil.h \
        $(top_srcdir)/include/libuutil_impl.h \
        $(top_srcdir)/include/libzfs.h \
+       $(top_srcdir)/include/libzfs_core.h \
        $(top_srcdir)/include/libzfs_impl.h
 
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
@@ -27,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
 endif
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)
+kerneldir = @prefix@/src/zfs-$(VERSION)/include
 kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
 endif