48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
|
From 3b3a7cf2d58fd863fef21553db5715c1dfab26a0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marek 'marx' Grac <mgrac@redhat.com>
|
||
|
|
Date: Wed, 27 Aug 2014 15:18:01 +0200
|
||
|
|
Subject: [PATCH 06/11] [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 5722e18..c113f06 100644
|
||
|
|
--- a/fence/agents/scsi/Makefile.am
|
||
|
|
+++ b/fence/agents/scsi/Makefile.am
|
||
|
|
@@ -20,4 +20,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
|
||
|
|
--
|
||
|
|
1.8.4.5
|
||
|
|
|