Improve error message for zfs create with @ or # in name

[mirror_zfs.git] / include / Makefile.am

diff --git a/include/Makefile.am b/include/Makefile.am
index 8325a8ec0446b5ced9ce5dd544c1ceba0eee9e68..bac47d98d9de6f69fd7405d1912de85b2b543ef7 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = linux sys
+SUBDIRS = linux spl sys
 
 COMMON_H = \
        $(top_srcdir)/include/zfeature_common.h \
@@ -6,11 +6,7 @@ COMMON_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 \
-       $(top_srcdir)/include/zpios-ctl.h
-
-KERNEL_H = \
-       $(top_srcdir)/include/zpios-internal.h
+       $(top_srcdir)/include/zfs_prop.h
 
 USER_H = \
        $(top_srcdir)/include/libnvpair.h \
@@ -18,9 +14,12 @@ USER_H = \
        $(top_srcdir)/include/libuutil.h \
        $(top_srcdir)/include/libuutil_impl.h \
        $(top_srcdir)/include/libzfs.h \
-       $(top_srcdir)/include/libzfs_impl.h
+       $(top_srcdir)/include/libzfs_core.h \
+       $(top_srcdir)/include/libzfs_impl.h \
+       $(top_srcdir)/include/libzutil.h \
+       $(top_srcdir)/include/thread_pool.h
 
-EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
+EXTRA_DIST = $(COMMON_H) $(USER_H)
 
 if CONFIG_USER
 libzfsdir = $(includedir)/libzfs
@@ -28,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
 endif
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)
-kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+kerneldir = @prefix@/src/zfs-$(VERSION)/include
+kernel_HEADERS = $(COMMON_H)
 endif