fence-agents: master - [build] Fix building of fence_scsi_check

Marek GrĂ¡c marx at fedoraproject.org
Tue Jul 1 13:07:31 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=f823459eee42c8858b8eca65f26d0e313db0e1d2
Commit:        f823459eee42c8858b8eca65f26d0e313db0e1d2
Parent:        f0bb209a3a35c46cdb3cc2cbb2bdbdf4051407dc
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Tue Jul 1 14:55:08 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Tue Jul 1 14:55:08 2014 +0200

[build] Fix building of fence_scsi_check

---
 fence/agents/scsi/Makefile.am |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fence/agents/scsi/Makefile.am b/fence/agents/scsi/Makefile.am
index 5722e18..c82e043 100644
--- a/fence/agents/scsi/Makefile.am
+++ b/fence/agents/scsi/Makefile.am
@@ -4,16 +4,20 @@ TARGET			= fence_scsi
 
 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


More information about the cluster-commits mailing list