fence-agents: master - [build] Fix automake files, so 'make distcheck' works

Marek GrĂ¡c marx at fedoraproject.org
Wed Aug 27 13:18:54 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=6a0d0f3c2dc3bb91107a4a84b734925af736332a
Commit:        6a0d0f3c2dc3bb91107a4a84b734925af736332a
Parent:        dddd66cd55d9607681d1a42da18c7b8cac0eab22
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Aug 27 15:18:01 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Aug 27 15:18:01 2014 +0200

[build] Fix automake files, so 'make distcheck' works

---
 Makefile.am                   |    2 +-
 fence/agents/Makefile.am      |    3 +--
 fence/agents/scsi/Makefile.am |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e70dac5..5e2e22d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ noinst_HEADERS		= make/copyright.cf
 
 ACLOCAL_AMFLAGS		= -I m4
 
-SUBDIRS			= fence doc
+SUBDIRS			= fence/agents/lib fence doc
 
 install-exec-local:
 			$(INSTALL) -d $(DESTDIR)/$(LOGDIR)
diff --git a/fence/agents/Makefile.am b/fence/agents/Makefile.am
index c47f5d5..3b76b9a 100644
--- a/fence/agents/Makefile.am
+++ b/fence/agents/Makefile.am
@@ -1,4 +1,3 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
-SUBDIRS 		= lib \
-			  $(AGENTS_LIST)
+SUBDIRS 		= $(AGENTS_LIST)
diff --git a/fence/agents/scsi/Makefile.am b/fence/agents/scsi/Makefile.am
index c82e043..b2a4fbf 100644
--- a/fence/agents/scsi/Makefile.am
+++ b/fence/agents/scsi/Makefile.am
@@ -24,4 +24,4 @@ include $(top_srcdir)/make/fenceman.mk
 include $(top_srcdir)/make/agentpycheck.mk
 
 clean-local: clean-man
-	rm -f $(TARGET) $(SYMTARGET)
+	rm -f $(TARGET) $(SYMTARGET) fence_scsi_check


More information about the cluster-commits mailing list