diff -urN fence-agents-4.0.10/fence/agents/scsi/Makefile.am fence-agents-4.0.10.new/fence/agents/scsi/Makefile.am --- fence-agents-4.0.10/fence/agents/scsi/Makefile.am 2014-07-01 12:53:45.000000000 +0200 +++ fence-agents-4.0.10.new/fence/agents/scsi/Makefile.am 2014-07-01 14:35:25.000000000 +0200 @@ -4,16 +4,20 @@ SRC = $(TARGET).py -EXTRA_DIST = $(SRC) +EXTRA_DIST = $(SRC) \ + fence_scsi_check -sbin_SCRIPTS = $(TARGET) fence_scsi_check +scsidatadir = $(CLUSTERDATA) +scsidata_SCRIPTS = fence_scsi_check + +sbin_SCRIPTS = $(TARGET) man_MANS = $(TARGET).8 FENCE_TEST_ARGS = -k 1 fence_scsi_check: $(TARGET) - cp -s $^ $@ + cp $^ $@ include $(top_srcdir)/make/fencebuild.mk include $(top_srcdir)/make/fenceman.mk diff -urN fence-agents-4.0.10/fence/agents/scsi/Makefile.in fence-agents-4.0.10.new/fence/agents/scsi/Makefile.in --- fence-agents-4.0.10/fence/agents/scsi/Makefile.in 2014-07-01 13:29:55.000000000 +0200 +++ fence-agents-4.0.10.new/fence/agents/scsi/Makefile.in 2014-07-01 14:35:36.000000000 +0200 @@ -121,8 +121,9 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" -SCRIPTS = $(sbin_SCRIPTS) +am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scsidatadir)" \ + "$(DESTDIR)$(man8dir)" +SCRIPTS = $(sbin_SCRIPTS) $(scsidata_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -284,8 +285,12 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_scsi SRC = $(TARGET).py -EXTRA_DIST = $(SRC) -sbin_SCRIPTS = $(TARGET) fence_scsi_check +EXTRA_DIST = $(SRC) \ + fence_scsi_check + +scsidatadir = $(CLUSTERDATA) +scsidata_SCRIPTS = fence_scsi_check +sbin_SCRIPTS = $(TARGET) man_MANS = $(TARGET).8 FENCE_TEST_ARGS = -k 1 TEMPFILE := $(shell mktemp) @@ -359,6 +364,41 @@ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir) +install-scsidataSCRIPTS: $(scsidata_SCRIPTS) + @$(NORMAL_INSTALL) + @list='$(scsidata_SCRIPTS)'; test -n "$(scsidatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(scsidatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(scsidatadir)" || exit 1; \ + fi; \ + 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; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(scsidatadir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(scsidatadir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-scsidataSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(scsidata_SCRIPTS)'; test -n "$(scsidatadir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + dir='$(DESTDIR)$(scsidatadir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -449,7 +489,7 @@ check: check-am all-am: Makefile $(SCRIPTS) $(MANS) installdirs: - for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \ + for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scsidatadir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -503,7 +543,7 @@ info-am: -install-data-am: install-man +install-data-am: install-man install-scsidataSCRIPTS install-dvi: install-dvi-am @@ -547,7 +587,8 @@ ps-am: -uninstall-am: uninstall-man uninstall-sbinSCRIPTS +uninstall-am: uninstall-man uninstall-sbinSCRIPTS \ + uninstall-scsidataSCRIPTS uninstall-man: uninstall-man8 @@ -560,16 +601,16 @@ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-man8 install-pdf install-pdf-am install-ps \ - install-ps-am install-sbinSCRIPTS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-man uninstall-man8 \ - uninstall-sbinSCRIPTS + install-ps-am install-sbinSCRIPTS install-scsidataSCRIPTS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am uninstall-man uninstall-man8 \ + uninstall-sbinSCRIPTS uninstall-scsidataSCRIPTS fence_scsi_check: $(TARGET) - cp -s $^ $@ + cp $^ $@ $(TARGET): $(SRC) bash $(top_srcdir)/scripts/fenceparse \ $(top_srcdir)/make/copyright.cf REDHAT_COPYRIGHT \