File 0006-Revert-Low-build-Move-binaries-in-usr-lib-... of Package resource-agents

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch of Package resource-agents

From 65dcc5d74aa1f4098a37fcb3961d4b13b70772a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Wed, 22 Jan 2014 11:20:23 +0100
Subject: [PATCH 6/6] 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 cbaa9d9d3d02..99bda6418f81 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 6e0a9d542e2f..26004a3eebb1 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:="%Y/%m/%d_%T "}
 : ${HA_DEBUGLOG:=/dev/null}
diff --git a/resource-agents.spec.in b/resource-agents.spec.in
index 64557dbece0f..5c831cb5212d 100644
--- a/resource-agents.spec.in
+++ b/resource-agents.spec.in
@@ -255,7 +255,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/shellfuncs
 
-%{_libexecdir}/heartbeat
+%{_libdir}/heartbeat
 
 %post -n resource-agents
 if [ $1 = 2 ]; then
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1186967cfbcb..71292bf33acc 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
 
-- 
1.8.4

Places

File 0006-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch of Package resource-agents

Places