12 files changed, 17 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index 4d8ab0e33..0bb3e46f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,18 @@ SUBDIRS += lib cmd scripts
 endif
 if CONFIG_KERNEL
 SUBDIRS += module
+
+extradir = /usr/src/spl-$(VERSION)
+extra_HEADERS = spl.release.in spl_config.h.in
+
+kerneldir = /usr/src/spl-$(VERSION)/$(LINUX_VERSION)
+nodist_kernel_HEADERS = spl.release spl_config.h module/$(LINUX_SYMBOLS)
 endif
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST  = autogen.sh spl.spec.in spl-modules.spec.in META DISCLAIMER
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 EXTRA_DIST += dkms.postinst copy-builtin
-noinst_HEADERS = spl_config.h spl.release
 
 distclean-local::
 	-$(RM) -R autom4te*.cache
@@ -28,15 +33,6 @@ distclean-local::
 		-o -name '*.order' -o -name '*.markers' \) \
 		-type f -print | xargs $(RM)
 
-if CONFIG_KERNEL
-install-data-local:
-	release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
-	instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
-	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
-		$(INSTALL) -m 644 -D $$instfile $$instdest/$$instfile; \
-	done
-endif
-
 ctags:
 	$(RM) $(top_srcdir)/tags
 	find $(top_srcdir) -name .git -prune -o -name '*.[hc]' | xargs ctags
diff --git a/include/Makefile.am b/include/Makefile.am
index 952c4a267..463bea1d1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,6 +16,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)
+kerneldir = /usr/src/spl-$(VERSION)/include
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/fs/Makefile.am b/include/fs/Makefile.am
index 2a3673712..530172ddc 100644
--- a/include/fs/Makefile.am
+++ b/include/fs/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/fs
+kerneldir = /usr/src/spl-$(VERSION)/include/fs
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index cf1f62ad1..730f7695b 100644
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -23,6 +23,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/linux
+kerneldir = /usr/src/spl-$(VERSION)/include/linux
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/rpc/Makefile.am b/include/rpc/Makefile.am
index cb68f4501..2f8aa29dd 100644
--- a/include/rpc/Makefile.am
+++ b/include/rpc/Makefile.am
@@ -9,6 +9,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/rpc
+kerneldir = /usr/src/spl-$(VERSION)/include/rpc
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/sharefs/Makefile.am b/include/sharefs/Makefile.am
index b343c75b7..d6175a502 100644
--- a/include/sharefs/Makefile.am
+++ b/include/sharefs/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sharefs
+kerneldir = /usr/src/spl-$(VERSION)/include/sharefs
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index 37e958229..0e86a2894 100644
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -104,7 +104,7 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sys
+kerneldir = /usr/src/spl-$(VERSION)/include/sys
 kernel_HEADERS = $(KERNEL_H)
 endif
 
diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
index a073d2a3b..1c9cf8416 100644
--- a/include/sys/fm/Makefile.am
+++ b/include/sys/fm/Makefile.am
@@ -9,6 +9,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sys/fm
+kerneldir = /usr/src/spl-$(VERSION)/include/sys/fm
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
index 3805a5ed3..27ae10988 100644
--- a/include/sys/fs/Makefile.am
+++ b/include/sys/fs/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sys/fs
+kerneldir = /usr/src/spl-$(VERSION)/include/sys/fs
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
index d2247d747..bf395eb2d 100644
--- a/include/sys/sysevent/Makefile.am
+++ b/include/sys/sysevent/Makefile.am
@@ -8,6 +8,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/sys/sysevent
+kerneldir = /usr/src/spl-$(VERSION)/include/sys/sysevent
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/util/Makefile.am b/include/util/Makefile.am
index 61fdff0bc..5ac96e8cc 100644
--- a/include/util/Makefile.am
+++ b/include/util/Makefile.am
@@ -9,6 +9,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/util
+kerneldir = /usr/src/spl-$(VERSION)/include/util
 kernel_HEADERS = $(KERNEL_H)
 endif
diff --git a/include/vm/Makefile.am b/include/vm/Makefile.am
index 9b09929db..413a6e325 100644
--- a/include/vm/Makefile.am
+++ b/include/vm/Makefile.am
@@ -10,6 +10,6 @@ USER_H =
 EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
 
 if CONFIG_KERNEL
-kerneldir = /usr/src/spl-$(SPL_META_VERSION)-$(SPL_META_RELEASE)/$(LINUX_VERSION)/vm
+kerneldir = /usr/src/spl-$(VERSION)/include/vm
 kernel_HEADERS = $(KERNEL_H)
 endif