Linux compat 2.6.39: mount_nodev()

[zfs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 951f44a..2fec907 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,6 +53,7 @@ DIST_COMMON = $(am__configure_deps) $(noinst_HEADERS) \
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
+       $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \
        $(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \
        $(top_srcdir)/config/kernel-bdev-logical-size.m4 \
        $(top_srcdir)/config/kernel-bio-empty-barrier.m4 \
@@ -75,9 +76,12 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-insert-inode-locked.m4 \
        $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \
        $(top_srcdir)/config/kernel-kobj-name-len.m4 \
+       $(top_srcdir)/config/kernel-mount-nodev.m4 \
        $(top_srcdir)/config/kernel-open-bdev-exclusive.m4 \
        $(top_srcdir)/config/kernel-rq-for-each_segment.m4 \
        $(top_srcdir)/config/kernel-rq-is_sync.m4 \
+       $(top_srcdir)/config/kernel-security-inode-init.m4 \
+       $(top_srcdir)/config/kernel-truncate-setsize.m4 \
        $(top_srcdir)/config/kernel-xattr-handler.m4 \
        $(top_srcdir)/config/kernel.m4 \
        $(top_srcdir)/config/user-arch.m4 \
@@ -85,7 +89,6 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-ioctl.m4 \
        $(top_srcdir)/config/user-libblkid.m4 \
        $(top_srcdir)/config/user-libuuid.m4 \
-       $(top_srcdir)/config/user-no-unused-but-set-variable.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
@@ -946,7 +949,7 @@ deb-modules: deb-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \
        release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \
        pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2; \
@@ -955,7 +958,7 @@ deb-modules: deb-local rpm-modules
 deb-utils: deb-local rpm-utils
        name=${PACKAGE}; \
        version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}.$${arch}.rpm; \
        pkg2=$${name}-devel-$${version}.$${arch}.rpm; \
        pkg3=$${name}-test-$${version}.$${arch}.rpm; \
@@ -977,7 +980,7 @@ tgz-modules: tgz-local rpm-modules
        name=${PACKAGE}-modules; \
        version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \
        release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \
        pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \
        fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2; \
@@ -986,7 +989,7 @@ tgz-modules: tgz-local rpm-modules
 tgz-utils: tgz-local rpm-utils
        name=${PACKAGE}; \
        version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \
-       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch}`; \
+       arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \
        pkg1=$${name}-$${version}.$${arch}.rpm; \
        pkg2=$${name}-devel-$${version}.$${arch}.rpm; \
        pkg3=$${name}-test-$${version}.$${arch}.rpm; \