58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From df5492f2dea1ff880308f6daf7043f3159aa4a89 Mon Sep 17 00:00:00 2001
|
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
Date: Tue, 5 Jul 2016 14:33:43 +0200
|
|
Subject: [PATCH] Fix install issue for symlinked agents
|
|
|
|
---
|
|
make/fencebuild.mk | 25 +++++++++++++++++++++++++
|
|
1 file changed, 25 insertions(+)
|
|
|
|
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
|
|
index 1d50398..f11aa8a 100644
|
|
--- a/make/fencebuild.mk
|
|
+++ b/make/fencebuild.mk
|
|
@@ -47,3 +47,28 @@ clean: clean-man
|
|
fi
|
|
|
|
clean-local: clean
|
|
+
|
|
+install-exec-hook: $(TARGET)
|
|
+ if [ -n "$(man8dir)" ]; then \
|
|
+ echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
|
|
+ $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
|
|
+ fi
|
|
+ for p in $(TARGET); do \
|
|
+ dir=`dirname $$p`; \
|
|
+ for x in `PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
|
|
+ echo " $(INSTALL_SCRIPT) $$dir/$$x '$(DESTDIR)$(sbindir)'"; \
|
|
+ $(INSTALL_SCRIPT) $$dir/$$x "$(DESTDIR)$(sbindir)" || exit $$?; \
|
|
+ echo " $(INSTALL_DATA) '$$dir/$$x.8' '$(DESTDIR)$(man8dir)'"; \
|
|
+ $(INSTALL_DATA) "$$dir/$$x.8" "$(DESTDIR)$(man8dir)" || exit $$?; \
|
|
+ done; \
|
|
+ done
|
|
+
|
|
+uninstall-hook: $(TARGET)
|
|
+ files=`for p in $(TARGET); do \
|
|
+ for x in \`PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"\`; do \
|
|
+ echo " rm -f '$(DESTDIR)$(sbindir)/$$x'"; \
|
|
+ rm -f "$(DESTDIR)$(sbindir)/$$x"; \
|
|
+ echo " rm -f '$(DESTDIR)$(man8dir)/$$x.8'"; \
|
|
+ rm -f "$(DESTDIR)$(man8dir)/$$x.8"; \
|
|
+ done; \
|
|
+ done`
|
|
--
|
|
2.7.4
|
|
|
|
diff -uNr a/fence/agents/Makefile.am b/fence/agents/Makefile.am
|
|
--- a/fence/agents/Makefile.am 2016-06-29 16:28:40.000000000 +0200
|
|
+++ b/fence/agents/Makefile.am 2016-07-13 12:51:34.950671572 +0200
|
|
@@ -31,7 +31,7 @@
|
|
scsidata_SCRIPTS = scsi/fence_scsi_check scsi/fence_scsi_check_hardreboot
|
|
|
|
zvm_fence_zvm_SOURCES = zvm/fence_zvm.c
|
|
-zvm_fence_zvm_CFLAGS = -D_GNU_SOURCE
|
|
+zvm_fence_zvm_CFLAGS = -D_GNU_SOURCE -Izvm
|
|
|
|
FENCE_TEST_ARGS = \
|
|
login=test\n\
|