Gitweb:
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=c32708...
Commit: c32708042d19bcb7265696581463fa28221305ce
Parent: 7e5af386b361bcc913b8e290be85cdae7f51e3ca
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Wed Mar 6 15:11:14 2013 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Wed Mar 6 15:15:31 2013 +0100
fencing: Install non-fence agents to libexec
Binaries/scripts which are not fence agents should be installed to libexec directory.
---
fence/agents/kdump/Makefile.am | 3 ++-
fence/agents/lib/fencing.py.py | 2 +-
fence/agents/nss_wrapper/Makefile.am | 2 +-
make/fencebuild.mk | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fence/agents/kdump/Makefile.am b/fence/agents/kdump/Makefile.am
index bc526c4..26e452c 100644
--- a/fence/agents/kdump/Makefile.am
+++ b/fence/agents/kdump/Makefile.am
@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
-sbin_PROGRAMS = fence_kdump fence_kdump_send
+sbin_PROGRAMS = fence_kdump
+libexec_PROGRAMS = fence_kdump_send
noinst_HEADERS = list.h message.h options.h version.h
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 22cf599..1109be6 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -27,7 +27,7 @@ EC_PASSWORD_MISSING = 10
TELNET_PATH = "/usr/bin/telnet"
SSH_PATH = "/usr/bin/ssh"
-SSL_PATH = "@SBINDIR@/fence_nss_wrapper"
+SSL_PATH = "@LIBEXECDIR@/fence_nss_wrapper"
SUDO_PATH = "/usr/bin/sudo"
all_opt = {
diff --git a/fence/agents/nss_wrapper/Makefile.am b/fence/agents/nss_wrapper/Makefile.am
index 5e47f97..16273ed 100644
--- a/fence/agents/nss_wrapper/Makefile.am
+++ b/fence/agents/nss_wrapper/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-sbin_PROGRAMS = fence_nss_wrapper
+libexec_PROGRAMS = fence_nss_wrapper
fence_nss_wrapper_CFLAGS = $(nss_CFLAGS) $(nspr_CFLAGS)
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 4a75366..e86d03c 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -8,4 +8,5 @@ $(TARGET): $(SRC)
-e 's#@''SNMPBIN@#${SNMPBIN}#g' \
-e 's#@''LOGDIR@#${LOGDIR}#g' \
-e 's#@''SBINDIR@#${sbindir}#g' \
+ -e 's#@''LIBEXECDIR@#${libexecdir}#g' \
$@