|
 |
cf07b3 |
diff --git a/heartbeat/Makefile.am b/heartbeat/Makefile.am
|
|
|
cf07b3 |
index 3a05974..777c6b1 100644
|
|
|
cf07b3 |
--- a/heartbeat/Makefile.am
|
|
|
cf07b3 |
+++ b/heartbeat/Makefile.am
|
|
|
cf07b3 |
@@ -25,7 +25,7 @@ EXTRA_DIST = $(ocf_SCRIPTS) $(ocfcommon_DATA) \
|
|
|
cf07b3 |
|
|
|
cf07b3 |
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha
|
|
|
cf07b3 |
|
|
|
cf07b3 |
-halibdir = $(libdir)/heartbeat
|
|
|
cf07b3 |
+halibdir = $(libexecdir)/heartbeat
|
|
|
cf07b3 |
|
|
|
cf07b3 |
ocfdir = $(OCF_RA_DIR_PREFIX)/heartbeat
|
|
|
cf07b3 |
|
|
|
cf07b3 |
diff --git a/heartbeat/ocf-directories.in b/heartbeat/ocf-directories.in
|
|
|
cf07b3 |
index 26004a3..6e0a9d5 100644
|
|
|
cf07b3 |
--- a/heartbeat/ocf-directories.in
|
|
|
cf07b3 |
+++ b/heartbeat/ocf-directories.in
|
|
|
cf07b3 |
@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
|
|
|
cf07b3 |
: ${HA_RSCTMP:=@HA_RSCTMPDIR@}
|
|
|
cf07b3 |
: ${HA_RSCTMP_OLD:=@HA_VARRUNDIR@/heartbeat/rsctmp}
|
|
|
cf07b3 |
: ${HA_FIFO:=@localstatedir@/lib/heartbeat/fifo}
|
|
|
cf07b3 |
-: ${HA_BIN:=@libdir@/heartbeat}
|
|
|
cf07b3 |
+: ${HA_BIN:=@libexecdir@/heartbeat}
|
|
|
cf07b3 |
: ${HA_SBIN_DIR:=@sbindir@}
|
|
|
cf07b3 |
: ${HA_DATEFMT:="%Y/%m/%d_%T "}
|
|
|
cf07b3 |
: ${HA_DEBUGLOG:=/dev/null}
|
|
|
cf07b3 |
diff --git a/resource-agents.spec.in b/resource-agents.spec.in
|
|
|
cf07b3 |
index c306398..e9f0688 100644
|
|
|
cf07b3 |
--- a/resource-agents.spec.in
|
|
|
cf07b3 |
+++ b/resource-agents.spec.in
|
|
|
cf07b3 |
@@ -255,7 +255,7 @@ rm -rf %{buildroot}
|
|
|
cf07b3 |
%dir %{_sysconfdir}/ha.d
|
|
|
cf07b3 |
%{_sysconfdir}/ha.d/shellfuncs
|
|
|
cf07b3 |
|
|
|
cf07b3 |
-%{_libdir}/heartbeat
|
|
|
cf07b3 |
+%{_libexecdir}/heartbeat
|
|
|
cf07b3 |
|
|
|
cf07b3 |
%post -n resource-agents
|
|
|
cf07b3 |
if [ $1 = 2 ]; then
|
|
|
cf07b3 |
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
|
|
cf07b3 |
index 971db1c..3205bbd 100644
|
|
|
cf07b3 |
--- a/tools/Makefile.am
|
|
|
cf07b3 |
+++ b/tools/Makefile.am
|
|
|
cf07b3 |
@@ -23,7 +23,7 @@ SUBDIRS = ocft
|
|
|
cf07b3 |
|
|
|
cf07b3 |
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
|
|
|
cf07b3 |
|
|
|
cf07b3 |
-halibdir = $(libdir)/heartbeat
|
|
|
cf07b3 |
+halibdir = $(libexecdir)/heartbeat
|
|
|
cf07b3 |
|
|
|
cf07b3 |
EXTRA_DIST = ocf-tester.8 sfex_init.8
|
|
|
cf07b3 |
|
|
|
cf07b3 |
|