Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch

Makefile.am

@@ -34,7 +34,7 @@ distclean-local::
 if CONFIG_KERNEL
 install-data-local:
 	destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \
-	instdest=$(DESTDIR)/${prefix}/src/$$destname; \
+	instdest=$(DESTDIR)/usr/src/$$destname; \
 	echo "${ZFS_META_VERSION}" >$$instdest/zfs.release; \
 	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \

config/zfs-build.m4

@@ -79,6 +79,7 @@ KERNEL_MODULES=(                                      \\
 
 SPL_MODULES=(                                         \\
         \${SPLBUILD}/spl/spl.ko                        \\
+        \${SPLBUILD}/splat/splat.ko                    \\
 )
 
 ZFS_MODULES=(                                         \\

module/Makefile.in

@@ -17,16 +17,29 @@ clean:
 	if [ -f Module.markers ]; then $(RM) Module.markers; fi
 
 modules_install:
+	# Install the kernel modules
 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
 		INSTALL_MOD_PATH=$(DESTDIR) \
 		INSTALL_MOD_DIR=addon/zfs $@
 	find ${DESTDIR}/lib/modules/ -name 'modules.*' | xargs ${RM}
+	sysmap=${DESTDIR}/boot/System.map-@LINUX_VERSION@; \
+	if [ -f $$sysmap ]; then \
+		depmod -ae -F $$sysmap @LINUX_VERSION@; \
+	fi
 	# Install the required headers in to the kernel source
 	destname=zfs-@ZFS_META_VERSION@/@LINUX_VERSION@; \
-	instdest=$(DESTDIR)/@prefix@/src/$$destname; \
+	instdest=$(DESTDIR)/usr/src/$$destname; \
 	(find . -mindepth 3 -name '*.h' | xargs -Ihdr sh -c \
 	 "DEST=hdr && install -D hdr $$instdest/\$${DEST#*/*/*/}") || exit 1
 
+modules_uninstall:
+	# Uninstall the kernel modules
+	$(RM) -R ${DESTDIR}/lib/modules/@LINUX_VERSION@/addon/zfs
+	# Uninstall the required headers from the kernel source
+	destname=zfs-@ZFS_META_VERSION@/@LINUX_VERSION@; \
+	instdest=$(DESTDIR)/usr/src/$$destname; \
+	$(RM) -R $$instdest
+
 distdir:
 	distfiles=`find . -name '*.c' -o -name '*.h'`; \
 	for distfile in $$distfiles; do \
@@ -37,5 +50,6 @@ distdir:
 
 distclean maintainer-clean: clean
 install: modules_install
+uninstall: modules_uninstall
 all: modules
 check:

scripts/common.sh.in

@@ -11,7 +11,7 @@ SCRIPT_CONFIG=.script-config
 if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then
 . "${basedir}/../${SCRIPT_CONFIG}"
 else
-MODULES=(zlib_deflate spl zavl znvpair zunicode zcommon zfs)
+MODULES=(zlib_deflate spl splat zavl znvpair zunicode zcommon zfs)
 fi
 
 PROG="<define PROG>"