diff options
author | Brian Behlendorf <[email protected]> | 2011-08-08 14:50:36 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2011-08-08 16:30:27 -0700 |
commit | de0a1c099b7dc6722eb428838e893a4d9490a21e (patch) | |
tree | ab8814de7efa8e15623fde421764957d9d639be5 /cmd/sas_switch_id | |
parent | 12d06bac9b22b11d8a322dfea4bdb50b106c254f (diff) |
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
Diffstat (limited to 'cmd/sas_switch_id')
-rw-r--r-- | cmd/sas_switch_id/Makefile.in | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/cmd/sas_switch_id/Makefile.in b/cmd/sas_switch_id/Makefile.in index 34bb462df..27a448bb9 100644 --- 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. |