Autogen refresh for udev changes

Run autogen.sh using the same autotools versions as upstream:

 * autoconf-2.63
 * automake-1.11.1
 * libtool-2.2.6b

diff --git a/Makefile.in b/Makefile.in
index dc46e32..3dbb517 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,6 +92,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -130,7 +131,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
        distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = dracut etc man scripts lib cmd module include
+DIST_SUBDIRS = dracut udev etc man scripts lib cmd module include
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -335,7 +336,9 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@CONFIG_USER_TRUE@USER_DIR = dracut etc man scripts lib cmd
+udevdir = @udevdir@
+udevruledir = @udevruledir@
+@CONFIG_USER_TRUE@USER_DIR = dracut udev etc man scripts lib cmd
 @CONFIG_KERNEL_TRUE@KERNEL_DIR = module
 SUBDIRS = $(USER_DIR) $(KERNEL_DIR) include
 AUTOMAKE_OPTIONS = foreign

diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index 7d868d8..f4038c4 100644 (file)
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -77,6 +77,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -303,6 +304,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = zfs zpool zdb zinject ztest zpios mount_zfs zpool_layout \
        zvol_id zpool_id sas_switch_id
 all: all-recursive

diff --git a/cmd/mount_zfs/Makefile.in b/cmd/mount_zfs/Makefile.in
index ccd7a15..b6dffc3 100644 (file)
--- a/cmd/mount_zfs/Makefile.in
+++ b/cmd/mount_zfs/Makefile.in
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -309,6 +310,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/cmd/sas_switch_id/Makefile.in b/cmd/sas_switch_id/Makefile.in
index 34bb462..27a448b 100644 (file)
--- a/cmd/sas_switch_id/Makefile.in
+++ b/cmd/sas_switch_id/Makefile.in
@@ -36,7 +36,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = cmd/sas_switch_id
-DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(dist_udev_SCRIPTS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -109,8 +110,8 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)"
-SCRIPTS = $(dist_bin_SCRIPTS)
+am__installdirs = "$(DESTDIR)$(udevdir)"
+SCRIPTS = $(dist_udev_SCRIPTS)
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
@@ -288,7 +289,9 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-dist_bin_SCRIPTS = sas_switch_id
+udevdir = @udevdir@
+udevruledir = @udevruledir@
+dist_udev_SCRIPTS = sas_switch_id
 all: all-am
 
 .SUFFIXES:
@@ -322,10 +325,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
+install-dist_udevSCRIPTS: $(dist_udev_SCRIPTS)
        @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-       @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+       test -z "$(udevdir)" || $(MKDIR_P) "$(DESTDIR)$(udevdir)"
+       @list='$(dist_udev_SCRIPTS)'; test -n "$(udevdir)" || list=; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -343,19 +346,19 @@ install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
        while read type dir files; do \
             if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
             test -z "$$files" || { \
-              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(udevdir)$$dir'"; \
+              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(udevdir)$$dir" || exit $$?; \
             } \
        ; done
 
-uninstall-dist_binSCRIPTS:
+uninstall-dist_udevSCRIPTS:
        @$(NORMAL_UNINSTALL)
-       @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+       @list='$(dist_udev_SCRIPTS)'; test -n "$(udevdir)" || exit 0; \
        files=`for p in $$list; do echo "$$p"; done | \
               sed -e 's,.*/,,;$(transform)'`; \
        test -n "$$list" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(bindir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(udevdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(udevdir)" && rm -f $$files
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -403,7 +406,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
 installdirs:
-       for dir in "$(DESTDIR)$(bindir)"; do \
+       for dir in "$(DESTDIR)$(udevdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -451,13 +454,13 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-dist_udevSCRIPTS
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-dist_binSCRIPTS
+install-exec-am:
 
 install-html: install-html-am
 
@@ -495,21 +498,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_binSCRIPTS
+uninstall-am: uninstall-dist_udevSCRIPTS
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
        dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dist_binSCRIPTS \
+       install-data install-data-am install-dist_udevSCRIPTS \
        install-dvi install-dvi-am install-exec install-exec-am \
        install-html install-html-am install-info install-info-am \
        install-man install-pdf install-pdf-am install-ps \
        install-ps-am install-strip installcheck installcheck-am \
        installdirs maintainer-clean maintainer-clean-generic \
        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am uninstall uninstall-am uninstall-dist_binSCRIPTS
+       ps ps-am uninstall uninstall-am uninstall-dist_udevSCRIPTS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in
index bc78a75..3acec3a 100644 (file)
--- a/cmd/zdb/Makefile.in
+++ b/cmd/zdb/Makefile.in
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -305,6 +306,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in
index 7a11189..78b8cd5 100644 (file)
--- a/cmd/zfs/Makefile.in
+++ b/cmd/zfs/Makefile.in
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -305,6 +306,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in
index 1897fd0..01c3baf 100644 (file)
--- a/cmd/zinject/Makefile.in
+++ b/cmd/zinject/Makefile.in
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -305,6 +306,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in
index ade9237..7fe48cc 100644 (file)
--- a/cmd/zpios/Makefile.in
+++ b/cmd/zpios/Makefile.in
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -295,6 +296,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in
index 89c7aac..80df098 100644 (file)
--- a/cmd/zpool/Makefile.in
+++ b/cmd/zpool/Makefile.in
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -306,6 +307,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/cmd/zpool_id/Makefile.in b/cmd/zpool_id/Makefile.in
index f4e837c..6ff1261 100644 (file)
--- a/cmd/zpool_id/Makefile.in
+++ b/cmd/zpool_id/Makefile.in
@@ -36,7 +36,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = cmd/zpool_id
-DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(dist_udev_SCRIPTS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -109,8 +110,8 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)"
-SCRIPTS = $(dist_bin_SCRIPTS)
+am__installdirs = "$(DESTDIR)$(udevdir)"
+SCRIPTS = $(dist_udev_SCRIPTS)
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
@@ -288,7 +289,9 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-dist_bin_SCRIPTS = zpool_id
+udevdir = @udevdir@
+udevruledir = @udevruledir@
+dist_udev_SCRIPTS = zpool_id
 all: all-am
 
 .SUFFIXES:
@@ -322,10 +325,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
+install-dist_udevSCRIPTS: $(dist_udev_SCRIPTS)
        @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-       @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+       test -z "$(udevdir)" || $(MKDIR_P) "$(DESTDIR)$(udevdir)"
+       @list='$(dist_udev_SCRIPTS)'; test -n "$(udevdir)" || list=; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -343,19 +346,19 @@ install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
        while read type dir files; do \
             if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
             test -z "$$files" || { \
-              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(udevdir)$$dir'"; \
+              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(udevdir)$$dir" || exit $$?; \
             } \
        ; done
 
-uninstall-dist_binSCRIPTS:
+uninstall-dist_udevSCRIPTS:
        @$(NORMAL_UNINSTALL)
-       @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+       @list='$(dist_udev_SCRIPTS)'; test -n "$(udevdir)" || exit 0; \
        files=`for p in $$list; do echo "$$p"; done | \
               sed -e 's,.*/,,;$(transform)'`; \
        test -n "$$list" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(bindir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(udevdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(udevdir)" && rm -f $$files
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -403,7 +406,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
 installdirs:
-       for dir in "$(DESTDIR)$(bindir)"; do \
+       for dir in "$(DESTDIR)$(udevdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -451,13 +454,13 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-dist_udevSCRIPTS
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-dist_binSCRIPTS
+install-exec-am:
 
 install-html: install-html-am
 
@@ -495,21 +498,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_binSCRIPTS
+uninstall-am: uninstall-dist_udevSCRIPTS
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
        dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dist_binSCRIPTS \
+       install-data install-data-am install-dist_udevSCRIPTS \
        install-dvi install-dvi-am install-exec install-exec-am \
        install-html install-html-am install-info install-info-am \
        install-man install-pdf install-pdf-am install-ps \
        install-ps-am install-strip installcheck installcheck-am \
        installdirs maintainer-clean maintainer-clean-generic \
        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am uninstall uninstall-am uninstall-dist_binSCRIPTS
+       ps ps-am uninstall uninstall-am uninstall-dist_udevSCRIPTS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/cmd/zpool_layout/Makefile.in b/cmd/zpool_layout/Makefile.in
index e38308a..0c1069b 100644 (file)
--- a/cmd/zpool_layout/Makefile.in
+++ b/cmd/zpool_layout/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -288,6 +289,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 dist_bin_SCRIPTS = zpool_layout
 all: all-am
 

diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in
index a9460c6..f11fac6 100644 (file)
--- a/cmd/ztest/Makefile.in
+++ b/cmd/ztest/Makefile.in
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -305,6 +306,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/cmd/zvol_id/Makefile.in b/cmd/zvol_id/Makefile.in
index ed80d40..e0b70ff 100644 (file)
--- a/cmd/zvol_id/Makefile.in
+++ b/cmd/zvol_id/Makefile.in
@@ -37,7 +37,7 @@ host_triplet = @host@
 target_triplet = @target@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/config/Rules.am
-bin_PROGRAMS = zvol_id$(EXEEXT)
+udev_PROGRAMS = zvol_id$(EXEEXT)
 subdir = cmd/zvol_id
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -89,8 +90,8 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/zfs_config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(udevdir)"
+PROGRAMS = $(udev_PROGRAMS)
 am_zvol_id_OBJECTS = zvol_id_main.$(OBJEXT)
 zvol_id_OBJECTS = $(am_zvol_id_OBJECTS)
 zvol_id_LDADD = $(LDADD)
@@ -295,6 +296,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
@@ -340,10 +343,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-udevPROGRAMS: $(udev_PROGRAMS)
        @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+       test -z "$(udevdir)" || $(MKDIR_P) "$(DESTDIR)$(udevdir)"
+       @list='$(udev_PROGRAMS)'; test -n "$(udevdir)" || list=; \
        for p in $$list; do echo "$$p $$p"; done | \
        sed 's/$(EXEEXT)$$//' | \
        while read p p1; do if test -f $$p || test -f $$p1; \
@@ -360,23 +363,23 @@ install-binPROGRAMS: $(bin_PROGRAMS)
        while read type dir files; do \
            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
            test -z "$$files" || { \
-           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(udevdir)$$dir'"; \
+           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(udevdir)$$dir" || exit $$?; \
            } \
        ; done
 
-uninstall-binPROGRAMS:
+uninstall-udevPROGRAMS:
        @$(NORMAL_UNINSTALL)
-       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+       @list='$(udev_PROGRAMS)'; test -n "$(udevdir)" || list=; \
        files=`for p in $$list; do echo "$$p"; done | \
          sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
              -e 's/$$/$(EXEEXT)/' `; \
        test -n "$$list" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(bindir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(udevdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(udevdir)" && rm -f $$files
 
-clean-binPROGRAMS:
-       @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+clean-udevPROGRAMS:
+       @list='$(udev_PROGRAMS)'; test -n "$$list" || exit 0; \
        echo " rm -f" $$list; \
        rm -f $$list || exit $$?; \
        test -n "$(EXEEXT)" || exit 0; \
@@ -527,7 +530,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
-       for dir in "$(DESTDIR)$(bindir)"; do \
+       for dir in "$(DESTDIR)$(udevdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -557,7 +560,8 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-udevPROGRAMS \
+       mostlyclean-am
 
 distclean: distclean-am
        -rm -rf ./$(DEPDIR)
@@ -577,13 +581,13 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-udevPROGRAMS
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS
+install-exec-am:
 
 install-html: install-html-am
 
@@ -623,23 +627,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-udevPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-       clean-generic clean-libtool ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-tags distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-binPROGRAMS install-data install-data-am install-dvi \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-libtool clean-udevPROGRAMS ctags distclean \
+       distclean-compile distclean-generic distclean-libtool \
+       distclean-tags distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-info install-info-am install-man \
        install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       pdf pdf-am ps ps-am tags uninstall uninstall-am \
-       uninstall-binPROGRAMS
+       install-strip install-udevPROGRAMS installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       tags uninstall uninstall-am uninstall-udevPROGRAMS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/configure b/configure
index 9f44463..3b136d7 100755 (executable)
--- a/configure
+++ b/configure
@@ -798,6 +798,8 @@ LIBSELINUX
 LIBBLKID
 LIBUUID
 ZLIB
+udevruledir
+udevdir
 KERNELCPPFLAGS
 KERNELMAKE_PARAMS
 SPL_SYMBOLS
@@ -975,6 +977,8 @@ with_linux
 with_linux_obj
 with_spl
 with_spl_obj
+with_udevdir
+with_udevruledir
 with_blkid
 with_selinux
 enable_debug
@@ -1643,6 +1647,8 @@ Optional Packages:
   --with-linux-obj=PATH   Path to kernel build objects
   --with-spl=PATH         Path to spl source
   --with-spl-obj=PATH     Path to spl build objects
+  --with-udevdir=DIR      install udev helpers [EPREFIX/lib/udev]
+  --with-udevruledir=DIR  install udev rules [UDEVDIR/rules.d]
   --with-blkid            support blkid caching [default=check]
   --with-selinux          support selinux [default=check]
 
@@ -4823,13 +4829,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4826: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4832: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4829: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4835: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4832: output\"" >&5)
+  (eval echo "\"\$as_me:4838: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6035,7 +6041,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6038 "configure"' > conftest.$ac_ext
+  echo '#line 6044 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7888,11 +7894,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7897: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7895: \$? = $ac_status" >&5
+   echo "$as_me:7901: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8227,11 +8233,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8230: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8236: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8234: \$? = $ac_status" >&5
+   echo "$as_me:8240: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8332,11 +8338,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8335: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8341: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8339: \$? = $ac_status" >&5
+   echo "$as_me:8345: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8387,11 +8393,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8390: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8396: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8394: \$? = $ac_status" >&5
+   echo "$as_me:8400: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11190,7 +11196,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11193 "configure"
+#line 11199 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11286,7 +11292,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11289 "configure"
+#line 11295 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14766,6 +14772,28 @@ fi
  ;;
                user)
 
+
+# Check whether --with-udevdir was given.
+if test "${with_udevdir+set}" = set; then
+  withval=$with_udevdir; udevdir=$withval
+else
+  udevdir='${exec_prefix}/lib/udev'
+fi
+
+
+
+# Check whether --with-udevruledir was given.
+if test "${with_udevruledir+set}" = set; then
+  withval=$with_udevruledir; udevruledir=$withval
+else
+  udevruledir='${udevdir}/rules.d'
+fi
+
+
+
+
+
+
        { $as_echo "$as_me:$LINENO: checking for target asm dir" >&5
 $as_echo_n "checking for target asm dir... " >&6; }
        TARGET_ARCH=`echo ${target_cpu} | sed -e s/i.86/i386/`
@@ -19102,6 +19130,28 @@ fi
 
 
 
+
+# Check whether --with-udevdir was given.
+if test "${with_udevdir+set}" = set; then
+  withval=$with_udevdir; udevdir=$withval
+else
+  udevdir='${exec_prefix}/lib/udev'
+fi
+
+
+
+# Check whether --with-udevruledir was given.
+if test "${with_udevruledir+set}" = set; then
+  withval=$with_udevruledir; udevruledir=$withval
+else
+  udevruledir='${udevdir}/rules.d'
+fi
+
+
+
+
+
+
        { $as_echo "$as_me:$LINENO: checking for target asm dir" >&5
 $as_echo_n "checking for target asm dir... " >&6; }
        TARGET_ARCH=`echo ${target_cpu} | sed -e s/i.86/i386/`
@@ -20694,7 +20744,7 @@ fi
 $as_echo "$enable_debug" >&6; }
 
 
-ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile etc/Makefile etc/udev/Makefile etc/udev/rules.d/Makefile etc/init.d/Makefile etc/init.d/zfs.arch etc/init.d/zfs.gentoo etc/init.d/zfs.lunar etc/init.d/zfs.fedora etc/init.d/zfs.lsb etc/init.d/zfs.redhat etc/zfs/Makefile man/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/sas_switch_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec zfs-script-config.sh"
+ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile udev/Makefile udev/rules.d/Makefile etc/Makefile etc/init.d/Makefile etc/init.d/zfs.arch etc/init.d/zfs.gentoo etc/init.d/zfs.lunar etc/init.d/zfs.fedora etc/init.d/zfs.lsb etc/init.d/zfs.redhat etc/zfs/Makefile man/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/sas_switch_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec zfs-script-config.sh"
 
 
 cat >confcache <<\_ACEOF
@@ -21613,9 +21663,9 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "dracut/Makefile") CONFIG_FILES="$CONFIG_FILES dracut/Makefile" ;;
     "dracut/90zfs/Makefile") CONFIG_FILES="$CONFIG_FILES dracut/90zfs/Makefile" ;;
+    "udev/Makefile") CONFIG_FILES="$CONFIG_FILES udev/Makefile" ;;
+    "udev/rules.d/Makefile") CONFIG_FILES="$CONFIG_FILES udev/rules.d/Makefile" ;;
     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
-    "etc/udev/Makefile") CONFIG_FILES="$CONFIG_FILES etc/udev/Makefile" ;;
-    "etc/udev/rules.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/udev/rules.d/Makefile" ;;
     "etc/init.d/Makefile") CONFIG_FILES="$CONFIG_FILES etc/init.d/Makefile" ;;
     "etc/init.d/zfs.arch") CONFIG_FILES="$CONFIG_FILES etc/init.d/zfs.arch" ;;
     "etc/init.d/zfs.gentoo") CONFIG_FILES="$CONFIG_FILES etc/init.d/zfs.gentoo" ;;

diff --git a/dracut/90zfs/Makefile.in b/dracut/90zfs/Makefile.in
index d395929..b63595b 100644 (file)
--- a/dracut/90zfs/Makefile.in
+++ b/dracut/90zfs/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -288,6 +289,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 pkgdracutdir = $(datadir)/dracut/modules.d/90zfs
 dist_pkgdracut_SCRIPTS = \
        $(top_srcdir)/dracut/90zfs/90-zfs.rules \

diff --git a/dracut/Makefile.in b/dracut/Makefile.in
index ee654de..22d3eb3 100644 (file)
--- a/dracut/Makefile.in
+++ b/dracut/Makefile.in
@@ -77,6 +77,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -303,6 +304,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = 90zfs
 EXTRA_DIST = README.dracut.markdown
 all: all-recursive

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 4f012e5..6989c23 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -77,6 +77,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -303,7 +304,9 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = init.d udev zfs
+udevdir = @udevdir@
+udevruledir = @udevruledir@
+SUBDIRS = init.d zfs
 all: all-recursive
 
 .SUFFIXES:

diff --git a/etc/init.d/Makefile.in b/etc/init.d/Makefile.in
index 7fb9034..6ca2e27 100644 (file)
--- a/etc/init.d/Makefile.in
+++ b/etc/init.d/Makefile.in
@@ -80,6 +80,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -267,6 +268,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 EXTRA_DIST = zfs.fedora zfs.gentoo zfs.lsb zfs.lunar zfs.redhat zfs.arch
 all: all-am
 

diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in
index ffdd1a9..3f8672d 100644 (file)
--- a/etc/zfs/Makefile.in
+++ b/etc/zfs/Makefile.in
@@ -78,6 +78,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -287,6 +288,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 pkgsysconfdir = $(sysconfdir)/zfs
 pkgsysconf_DATA = \
        zdev.conf \

diff --git a/include/Makefile.in b/include/Makefile.in
index 8764d09..de3af33 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -347,6 +348,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = linux sys
 COMMON_H = \
        $(top_srcdir)/include/zfs_comutil.h \

diff --git a/include/linux/Makefile.in b/include/linux/Makefile.in
index 3a901c3..7e65511 100644 (file)
--- a/include/linux/Makefile.in
+++ b/include/linux/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -294,6 +295,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 COMMON_H = 
 KERNEL_H = \
        $(top_srcdir)/include/linux/dcache_compat.h \

diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in
index 4cf397c..6adc1ee 100644 (file)
--- a/include/sys/Makefile.in
+++ b/include/sys/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -472,6 +473,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = fm fs
 COMMON_H = \
        $(top_srcdir)/include/sys/arc.h \

diff --git a/include/sys/fm/Makefile.in b/include/sys/fm/Makefile.in
index 30d2c4a..036fd47 100644 (file)
--- a/include/sys/fm/Makefile.in
+++ b/include/sys/fm/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -332,6 +333,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = fs
 COMMON_H = \
        $(top_srcdir)/include/sys/fm/protocol.h \

diff --git a/include/sys/fm/fs/Makefile.in b/include/sys/fm/fs/Makefile.in
index 76a2157..2cff6d6 100644 (file)
--- a/include/sys/fm/fs/Makefile.in
+++ b/include/sys/fm/fs/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -292,6 +293,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 COMMON_H = \
        $(top_srcdir)/include/sys/fm/fs/zfs.h
 

diff --git a/include/sys/fs/Makefile.in b/include/sys/fs/Makefile.in
index 8567e01..fd9c146 100644 (file)
--- a/include/sys/fs/Makefile.in
+++ b/include/sys/fs/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -292,6 +293,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 COMMON_H = \
        $(top_srcdir)/include/sys/fs/zfs.h
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 2f8d492..86b0aef 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -77,6 +77,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -303,6 +304,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = libspl libavl libefi libnvpair libshare libunicode libuutil \
        libzpool libzfs
 all: all-recursive

diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in
index 33484b3..5135c87 100644 (file)
--- a/lib/libavl/Makefile.in
+++ b/lib/libavl/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -318,6 +319,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in
index ec4e14a..25d61b2 100644 (file)
--- a/lib/libefi/Makefile.in
+++ b/lib/libefi/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -318,6 +319,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index 7d3eaa4..691c081 100644 (file)
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -319,6 +320,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libshare/Makefile.in b/lib/libshare/Makefile.in
index 6254a97..0025019 100644 (file)
--- a/lib/libshare/Makefile.in
+++ b/lib/libshare/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -318,6 +319,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in
index 238ab00..92be7c1 100644 (file)
--- a/lib/libspl/Makefile.in
+++ b/lib/libspl/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -366,6 +367,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in
index 6fe820c..8fed7b6 100644 (file)
--- a/lib/libspl/asm-generic/Makefile.in
+++ b/lib/libspl/asm-generic/Makefile.in
@@ -78,6 +78,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -264,6 +265,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in
index 1f951ad..703cbf5 100644 (file)
--- a/lib/libspl/asm-i386/Makefile.in
+++ b/lib/libspl/asm-i386/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -268,6 +269,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-i386/*.S
 all: all-am
 

diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in
index 10226a9..ff5ba0f 100644 (file)
--- a/lib/libspl/asm-x86_64/Makefile.in
+++ b/lib/libspl/asm-x86_64/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -268,6 +269,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 noinst_HEADERS = $(top_srcdir)/lib/libspl/asm-x86_64/*.S
 all: all-am
 

diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in
index 88b8404..6891306 100644 (file)
--- a/lib/libspl/include/Makefile.in
+++ b/lib/libspl/include/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -328,6 +329,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = ia32 rpc sys util
 libspldir = $(includedir)/libspl
 libspl_HEADERS = \

diff --git a/lib/libspl/include/ia32/Makefile.in b/lib/libspl/include/ia32/Makefile.in
index 36af1a8..a758a73 100644 (file)
--- a/lib/libspl/include/ia32/Makefile.in
+++ b/lib/libspl/include/ia32/Makefile.in
@@ -77,6 +77,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -303,6 +304,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = sys
 all: all-recursive
 

diff --git a/lib/libspl/include/ia32/sys/Makefile.in b/lib/libspl/include/ia32/sys/Makefile.in
index ff11b1d..7d9c283 100644 (file)
--- a/lib/libspl/include/ia32/sys/Makefile.in
+++ b/lib/libspl/include/ia32/sys/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -290,6 +291,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 libspldir = $(includedir)/libspl/ia32/sys
 libspl_HEADERS = \
         $(top_srcdir)/lib/libspl/include/ia32/sys/asm_linkage.h

diff --git a/lib/libspl/include/rpc/Makefile.in b/lib/libspl/include/rpc/Makefile.in
index e2ae91c..d15599a 100644 (file)
--- a/lib/libspl/include/rpc/Makefile.in
+++ b/lib/libspl/include/rpc/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -290,6 +291,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 libspldir = $(includedir)/libspl/rpc
 libspl_HEADERS = \
        $(top_srcdir)/lib/libspl/include/rpc/types.h \

diff --git a/lib/libspl/include/sys/Makefile.in b/lib/libspl/include/sys/Makefile.in
index eeaca9b..3007306 100644 (file)
--- a/lib/libspl/include/sys/Makefile.in
+++ b/lib/libspl/include/sys/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -328,6 +329,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = dktp sysevent
 libspldir = $(includedir)/libspl/sys
 libspl_HEADERS = \

diff --git a/lib/libspl/include/sys/dktp/Makefile.in b/lib/libspl/include/sys/dktp/Makefile.in
index c9b0115..4f85865 100644 (file)
--- a/lib/libspl/include/sys/dktp/Makefile.in
+++ b/lib/libspl/include/sys/dktp/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -290,6 +291,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 libspldir = $(includedir)/libspl/sys/dktp
 libspl_HEADERS = \
        $(top_srcdir)/lib/libspl/include/sys/dktp/fdisk.h

diff --git a/lib/libspl/include/sys/sysevent/Makefile.in b/lib/libspl/include/sys/sysevent/Makefile.in
index c37669f..d254e86 100644 (file)
--- a/lib/libspl/include/sys/sysevent/Makefile.in
+++ b/lib/libspl/include/sys/sysevent/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -290,6 +291,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 libspldir = $(includedir)/libspl/sys/sysevent
 libspl_HEADERS = \
        $(top_srcdir)/lib/libspl/include/sys/sysevent/eventdefs.h

diff --git a/lib/libspl/include/util/Makefile.in b/lib/libspl/include/util/Makefile.in
index 70ce973..d9d313f 100644 (file)
--- a/lib/libspl/include/util/Makefile.in
+++ b/lib/libspl/include/util/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -290,6 +291,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 libspldir = $(includedir)/libspl
 libspl_HEADERS = \
        $(top_srcdir)/lib/libspl/include/util/sscanf.h

diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in
index 6b5d575..757f76b 100644 (file)
--- a/lib/libunicode/Makefile.in
+++ b/lib/libunicode/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -318,6 +319,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in
index 2c2c8e5..391ad4b 100644 (file)
--- a/lib/libuutil/Makefile.in
+++ b/lib/libuutil/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -320,6 +321,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in
index ad31c72..3c3c399 100644 (file)
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -326,6 +327,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in
index 1b60fe3..ec612ee 100644 (file)
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@@ -79,6 +79,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -336,6 +337,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent

diff --git a/man/Makefile.in b/man/Makefile.in
index 068617b..c1c9ca3 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -77,6 +77,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -303,6 +304,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = man8
 all: all-recursive
 

diff --git a/man/man8/Makefile.in b/man/man8/Makefile.in
index f9fe5fb..48dba3f 100644 (file)
--- a/man/man8/Makefile.in
+++ b/man/man8/Makefile.in
@@ -77,6 +77,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -288,6 +289,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 man_MANS = zdb.8 zfs.8 zpool.8
 EXTRA_DIST = $(man_MANS)
 all: all-am

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 3e0c8f9..6994a48 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -78,6 +78,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -328,6 +329,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
 dist_pkglibexec_SCRIPTS = \
        $(top_builddir)/scripts/common.sh \

diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in
index cef88fb..f172314 100644 (file)
--- a/scripts/zpios-profile/Makefile.in
+++ b/scripts/zpios-profile/Makefile.in
@@ -78,6 +78,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -288,6 +289,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 dist_pkglibexec_SCRIPTS = \
        $(top_srcdir)/scripts/zpios-profile/zpios-profile-disk.sh \
        $(top_srcdir)/scripts/zpios-profile/zpios-profile-pids.sh \

diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in
index 8dbaa6b..f48d9cc 100644 (file)
--- a/scripts/zpios-test/Makefile.in
+++ b/scripts/zpios-test/Makefile.in
@@ -78,6 +78,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -288,6 +289,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 dist_pkglibexec_SCRIPTS = \
        $(top_srcdir)/scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh \
        $(top_srcdir)/scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh \

diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in
index 3a8d836..4930111 100644 (file)
--- a/scripts/zpool-config/Makefile.in
+++ b/scripts/zpool-config/Makefile.in
@@ -78,6 +78,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -288,6 +289,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 dist_pkglibexec_SCRIPTS = \
        $(top_srcdir)/scripts/zpool-config/dm0-raid0.sh \
        $(top_srcdir)/scripts/zpool-config/file-raid0.sh \

diff --git a/scripts/zpool-layout/Makefile.in b/scripts/zpool-layout/Makefile.in
index e34d0dc..ea73f33 100644 (file)
--- a/scripts/zpool-layout/Makefile.in
+++ b/scripts/zpool-layout/Makefile.in
@@ -78,6 +78,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -288,6 +289,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 dist_pkglibexec_SCRIPTS = \
        $(top_srcdir)/scripts/zpool-layout/dragon.ddn.conf \
        $(top_srcdir)/scripts/zpool-layout/dragon.llnl.conf

diff --git a/udev/Makefile.in b/udev/Makefile.in
index 7a9a0c3..ff7fb61 100644 (file)
--- a/udev/Makefile.in
+++ b/udev/Makefile.in
@@ -34,7 +34,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = etc/udev
+subdir = udev
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -77,6 +77,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -303,6 +304,8 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+udevdir = @udevdir@
+udevruledir = @udevruledir@
 SUBDIRS = rules.d
 all: all-recursive
 
@@ -316,9 +319,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/udev/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu udev/Makefile'; \
        $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu etc/udev/Makefile
+         $(AUTOMAKE) --gnu udev/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \

diff --git a/udev/rules.d/Makefile.in b/udev/rules.d/Makefile.in
index 852d44d..06ef0a9 100644 (file)
--- a/udev/rules.d/Makefile.in
+++ b/udev/rules.d/Makefile.in
@@ -35,7 +35,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = etc/udev/rules.d
+subdir = udev/rules.d
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -78,6 +78,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/user-libuuid.m4 \
        $(top_srcdir)/config/user-nptl_guard_within_stack.m4 \
        $(top_srcdir)/config/user-selinux.m4 \
+       $(top_srcdir)/config/user-udev.m4 \
        $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \
        $(top_srcdir)/config/zfs-build.m4 \
        $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac
@@ -116,8 +117,8 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkgsysconfdir)"
-DATA = $(pkgsysconf_DATA)
+am__installdirs = "$(DESTDIR)$(udevruledir)"
+DATA = $(udevrule_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALIEN = @ALIEN@
@@ -287,8 +288,9 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-pkgsysconfdir = $(sysconfdir)/udev/rules.d
-pkgsysconf_DATA = \
+udevdir = @udevdir@
+udevruledir = @udevruledir@
+udevrule_DATA = \
        60-zpool.rules \
        60-zvol.rules
 
@@ -308,9 +310,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
              exit 1;; \
          esac; \
        done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/udev/rules.d/Makefile'; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu udev/rules.d/Makefile'; \
        $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --gnu etc/udev/rules.d/Makefile
+         $(AUTOMAKE) --gnu udev/rules.d/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
@@ -335,26 +337,26 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-pkgsysconfDATA: $(pkgsysconf_DATA)
+install-udevruleDATA: $(udevrule_DATA)
        @$(NORMAL_INSTALL)
-       test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
-       @list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
+       test -z "$(udevruledir)" || $(MKDIR_P) "$(DESTDIR)$(udevruledir)"
+       @list='$(udevrule_DATA)'; test -n "$(udevruledir)" || list=; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
        done | $(am__base_list) | \
        while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevruledir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(udevruledir)" || exit $$?; \
        done
 
-uninstall-pkgsysconfDATA:
+uninstall-udevruleDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
+       @list='$(udevrule_DATA)'; test -n "$(udevruledir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(pkgsysconfdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(pkgsysconfdir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(udevruledir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(udevruledir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -396,7 +398,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-       for dir in "$(DESTDIR)$(pkgsysconfdir)"; do \
+       for dir in "$(DESTDIR)$(udevruledir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -444,7 +446,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-pkgsysconfDATA
+install-data-am: install-udevruleDATA
 
 install-dvi: install-dvi-am
 
@@ -488,7 +490,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-pkgsysconfDATA
+uninstall-am: uninstall-udevruleDATA
 
 .MAKE: install-am install-strip
 
@@ -498,18 +500,19 @@ uninstall-am: uninstall-pkgsysconfDATA
        install-am install-data install-data-am install-dvi \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-pkgsysconfDATA install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am uninstall uninstall-am uninstall-pkgsysconfDATA
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip install-udevruleDATA installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+       uninstall-udevruleDATA
 
 
-$(pkgsysconf_DATA):
-       -$(SED) -e 's,@bindir\@,$(bindir),g' '$@.in' >'$@'
+$(udevrule_DATA):
+       -$(SED) -e 's,@udevdir\@,$(udevdir),g' '$@.in' >'$@'
 
 distclean-local::
-       -$(RM) $(pkgsysconf_DATA)
+       -$(RM) $(udevrule_DATA)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.