- allow packaging on systems without systemd

[packages/cluster-glue.git] / cluster-glue-heartbeat-libexecdir.patch

--- Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac.orig	2018-09-02 19:59:05.526581895 +0200
+++ Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac	2018-09-02 20:16:41.086569843 +0200
@@ -378,7 +378,7 @@
 AC_SUBST(GLUE_DAEMON_GROUP)
 
 dnl Eventually move out of the heartbeat dir tree and create symlinks when needed
-GLUE_DAEMON_DIR=$libdir/heartbeat
+GLUE_DAEMON_DIR=$libexecdir/heartbeat
 AC_DEFINE_UNQUOTED(GLUE_DAEMON_DIR,"$GLUE_DAEMON_DIR", Location for daemons)
 AC_SUBST(GLUE_DAEMON_DIR)
 
--- Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.in.orig	2014-07-18 13:40:19.000000000 +0200
+++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.in	2018-09-02 21:02:53.446538187 +0200
@@ -35,7 +35,7 @@
 LOGD_CFG=@sysconfdir@/logd.cf
 LOGD_OPT=""
 [ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG"
-LOGD_BIN="@libdir@/@HB_PKG@/ha_logd"
+LOGD_BIN="@libexecdir@/@HB_PKG@/ha_logd"
 
 if [ ! -f $LOGD_BIN ]; then
   echo -n "ha_logd not installed."
--- Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.service.in.orig	2014-07-18 13:40:19.000000000 +0200
+++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.service.in	2018-09-02 21:03:11.789871314 +0200
@@ -4,7 +4,7 @@
 PartOf=pacemaker.service
 
 [Service]
-ExecStart=@libdir@/@HB_PKG@/ha_logd -c @sysconfdir@/logd.cf
+ExecStart=@libexecdir@/@HB_PKG@/ha_logd -c @sysconfdir@/logd.cf
 ExecStartPre=/bin/rm -f @HA_VARRUNDIR@/logd.pid
 ExecStopPost=/bin/rm -f @HA_VARRUNDIR@/logd.pid
 PIDFile=@HA_VARRUNDIR@/logd.pid
--- Reusable-Cluster-Components-glue--glue-1.0.12/lrm/lrmd/Makefile.am.orig	2014-07-18 13:40:19.000000000 +0200
+++ Reusable-Cluster-Components-glue--glue-1.0.12/lrm/lrmd/Makefile.am	2018-09-02 21:06:51.293202137 +0200
@@ -23,13 +23,13 @@
 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
 		  -I$(top_builddir)          -I$(top_srcdir)
 
-halibdir	=  $(libdir)/@HB_PKG@
+halibexecdir	=  $(libexecdir)/@HB_PKG@
 
 COMMONLIBS	=  $(top_builddir)/lib/clplumbing/libplumb.la   \
 		   $(GLIBLIB)
 #		   $(top_builddir)/lib/apphb/libapphb.la 	
 
-halib_PROGRAMS 	=  lrmd
+halibexec_PROGRAMS 	=  lrmd
 
 lrmd_SOURCES 	=  lrmd.c audit.c cib_secrets.c lrmd_fdecl.h lrmd.h
 
--- Reusable-Cluster-Components-glue--glue-1.0.12/logd/Makefile.am.orig	2018-09-02 19:59:05.523248561 +0200
+++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/Makefile.am	2018-09-02 21:09:16.383200482 +0200
@@ -24,7 +24,7 @@
 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
 
-halibdir		= $(libdir)/@HB_PKG@
+halibexecdir		= $(libexecdir)/@HB_PKG@
 ha_sbindir		= $(sbindir)
 
 LIBRT 			= @LIBRT@
@@ -34,7 +34,7 @@
   
 ## binary progs
 ha_sbin_PROGRAMS  = ha_logger
-halib_PROGRAMS	  = ha_logd logtest
+halibexec_PROGRAMS	  = ha_logd logtest
 
 ha_logd_SOURCES	  = ha_logd.c
 ha_logd_LDADD	  = $(top_builddir)/lib/clplumbing/libplumb.la		\
--- Reusable-Cluster-Components-glue--glue-1.0.12/lib/clplumbing/Makefile.am.orig	2018-09-02 19:59:05.509915228 +0200
+++ Reusable-Cluster-Components-glue--glue-1.0.12/lib/clplumbing/Makefile.am	2018-09-02 21:16:57.366528550 +0200
@@ -69,7 +69,7 @@
 			$(top_builddir)/lib/pils/libpils.la
 libplumbgpl_la_LDFLAGS	= -version-info 2:0:0
 
-testdir = $(libdir)/@HB_PKG@
+testdir = $(libexecdir)/@HB_PKG@
 test_PROGRAMS = ipctest ipctransientclient ipctransientserver base64_md5_test
 test_SCRIPTS  = transient-test.sh