-SUBDIRS = fs linux rpc sharefs sys util vm
+SUBDIRS = linux spl sys
-COMMON_H =
+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 \
+ $(top_srcdir)/include/zfs_namecheck.h \
+ $(top_srcdir)/include/zfs_prop.h
-KERNEL_H = \
- $(top_srcdir)/include/splat-ctl.h \
- $(top_srcdir)/include/spl-ctl.h \
- $(top_srcdir)/include/spl-debug.h \
- $(top_srcdir)/include/spl-device.h \
- $(top_srcdir)/include/spl-trace.h \
- $(top_srcdir)/include/strings.h \
- $(top_srcdir)/include/unistd.h
+USER_H = \
+ $(top_srcdir)/include/libnvpair.h \
+ $(top_srcdir)/include/libuutil_common.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 \
+ $(top_srcdir)/include/libzutil.h \
+ $(top_srcdir)/include/thread_pool.h
-USER_H =
+EXTRA_DIST = $(COMMON_H) $(USER_H)
-EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+if CONFIG_USER
+libzfsdir = $(includedir)/libzfs
+libzfs_HEADERS = $(COMMON_H) $(USER_H)
+endif
if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)
-kernel_HEADERS = $(KERNEL_H)
+kerneldir = @prefix@/src/zfs-$(VERSION)/include
+kernel_HEADERS = $(COMMON_H)
endif