From 1072e6d34fd9edb374385d7430471257335984c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Thu, 18 May 2017 00:18:14 +0200 Subject: [PATCH 4/5] Revert "Low: build: Move binaries in /usr/lib/heartbeat to /usr/libexec/heartbeat to avoid multi-lib inconsistencies" This reverts commit 1e79b7831d9daf9cbfa852f0d6f909d2f7ec4a2a. --- heartbeat/Makefile.am | 2 +- heartbeat/ocf-directories.in | 2 +- resource-agents.spec.in | 2 +- tools/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heartbeat/Makefile.am b/heartbeat/Makefile.am index fd3ca454..4950c6e5 100644 --- a/heartbeat/Makefile.am +++ b/heartbeat/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = $(ocf_SCRIPTS) $(ocfcommon_DATA) \ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha -halibdir = $(libexecdir)/heartbeat +halibdir = $(libdir)/heartbeat ocfdir = $(OCF_RA_DIR_PREFIX)/heartbeat diff --git a/heartbeat/ocf-directories.in b/heartbeat/ocf-directories.in index d8df035e..f734162e 100644 --- a/heartbeat/ocf-directories.in +++ b/heartbeat/ocf-directories.in @@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ : ${HA_RSCTMP:=@HA_RSCTMPDIR@} : ${HA_RSCTMP_OLD:=@HA_VARRUNDIR@/heartbeat/rsctmp} : ${HA_FIFO:=@localstatedir@/lib/heartbeat/fifo} -: ${HA_BIN:=@libexecdir@/heartbeat} +: ${HA_BIN:=@libdir@/heartbeat} : ${HA_SBIN_DIR:=@sbindir@} : ${HA_DATEFMT:="%b %d %T "} : ${HA_DEBUGLOG:=/dev/null} diff --git a/resource-agents.spec.in b/resource-agents.spec.in index 78021f1d..cde87b15 100644 --- a/resource-agents.spec.in +++ b/resource-agents.spec.in @@ -289,7 +289,7 @@ %dir %{_sysconfdir}/ha.d %{_sysconfdir}/ha.d/shellfuncs -%{_libexecdir}/heartbeat +%{_libdir}/heartbeat %if %{with rgmanager} %post -n resource-agents diff --git a/tools/Makefile.am b/tools/Makefile.am index 1186967c..71292bf3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,7 +23,7 @@ SUBDIRS = ocft AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -halibdir = $(libexecdir)/heartbeat +halibdir = $(libdir)/heartbeat EXTRA_DIST = ocf-tester.8 sfex_init.8 -- 2.13.2