cluster-glue-heartbeat-libexecdir.patch

   1 --- Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac.orig     2018-09-02 19:59:05.526581895 +0200
   2 +++ Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac  2018-09-02 20:16:41.086569843 +0200
   3 @@ -378,7 +378,7 @@
   4  AC_SUBST(GLUE_DAEMON_GROUP)
   5
   6  dnl Eventually move out of the heartbeat dir tree and create symlinks when needed
   7 -GLUE_DAEMON_DIR=$libdir/heartbeat
   8 +GLUE_DAEMON_DIR=$libexecdir/heartbeat
   9  AC_DEFINE_UNQUOTED(GLUE_DAEMON_DIR,"$GLUE_DAEMON_DIR", Location for daemons)
  10  AC_SUBST(GLUE_DAEMON_DIR)
  11
  12 --- Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.in.orig     2014-07-18 13:40:19.000000000 +0200
  13 +++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.in  2018-09-02 21:02:53.446538187 +0200
  14 @@ -35,7 +35,7 @@
  15  LOGD_CFG=@sysconfdir@/logd.cf
  16  LOGD_OPT=""
  17  [ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG"
  18 -LOGD_BIN="@libdir@/@HB_PKG@/ha_logd"
  19 +LOGD_BIN="@libexecdir@/@HB_PKG@/ha_logd"
  20
  21  if [ ! -f $LOGD_BIN ]; then
  22    echo -n "ha_logd not installed."
  23 --- Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.service.in.orig     2014-07-18 13:40:19.000000000 +0200
  24 +++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.service.in  2018-09-02 21:03:11.789871314 +0200
  25 @@ -4,7 +4,7 @@
  26  PartOf=pacemaker.service
  27
  28  [Service]
  29 -ExecStart=@libdir@/@HB_PKG@/ha_logd -c @sysconfdir@/logd.cf
  30 +ExecStart=@libexecdir@/@HB_PKG@/ha_logd -c @sysconfdir@/logd.cf
  31  ExecStartPre=/bin/rm -f @HA_VARRUNDIR@/logd.pid
  32  ExecStopPost=/bin/rm -f @HA_VARRUNDIR@/logd.pid
  33  PIDFile=@HA_VARRUNDIR@/logd.pid
  34 --- Reusable-Cluster-Components-glue--glue-1.0.12/lrm/lrmd/Makefile.am.orig     2014-07-18 13:40:19.000000000 +0200
  35 +++ Reusable-Cluster-Components-glue--glue-1.0.12/lrm/lrmd/Makefile.am  2018-09-02 21:06:51.293202137 +0200
  36 @@ -23,13 +23,13 @@
  37                   -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
  38                   -I$(top_builddir)          -I$(top_srcdir)
  39
  40 -halibdir       =  $(libdir)/@HB_PKG@
  41 +halibexecdir   =  $(libexecdir)/@HB_PKG@
  42
  43  COMMONLIBS     =  $(top_builddir)/lib/clplumbing/libplumb.la   \
  44                    $(GLIBLIB)
  45  #                 $(top_builddir)/lib/apphb/libapphb.la
  46
  47 -halib_PROGRAMS         =  lrmd
  48 +halibexec_PROGRAMS     =  lrmd
  49
  50  lrmd_SOURCES   =  lrmd.c audit.c cib_secrets.c lrmd_fdecl.h lrmd.h
  51
  52 --- Reusable-Cluster-Components-glue--glue-1.0.12/logd/Makefile.am.orig 2018-09-02 19:59:05.523248561 +0200
  53 +++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/Makefile.am      2018-09-02 21:09:16.383200482 +0200
  54 @@ -24,7 +24,7 @@
  55                         -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
  56                         -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
  57
  58 -halibdir               = $(libdir)/@HB_PKG@
  59 +halibexecdir           = $(libexecdir)/@HB_PKG@
  60  ha_sbindir             = $(sbindir)
  61
  62  LIBRT                  = @LIBRT@
  63 @@ -34,7 +34,7 @@
  64
  65  ## binary progs
  66  ha_sbin_PROGRAMS  = ha_logger
  67 -halib_PROGRAMS   = ha_logd logtest
  68 +halibexec_PROGRAMS       = ha_logd logtest
  69
  70  ha_logd_SOURCES          = ha_logd.c
  71  ha_logd_LDADD    = $(top_builddir)/lib/clplumbing/libplumb.la          \
  72 --- Reusable-Cluster-Components-glue--glue-1.0.12/lib/clplumbing/Makefile.am.orig       2018-09-02 19:59:05.509915228 +0200
  73 +++ Reusable-Cluster-Components-glue--glue-1.0.12/lib/clplumbing/Makefile.am    2018-09-02 21:16:57.366528550 +0200
  74 @@ -69,7 +69,7 @@
  75                         $(top_builddir)/lib/pils/libpils.la
  76  libplumbgpl_la_LDFLAGS = -version-info 2:0:0
  77
  78 -testdir = $(libdir)/@HB_PKG@
  79 +testdir = $(libexecdir)/@HB_PKG@
  80  test_PROGRAMS = ipctest ipctransientclient ipctransientserver base64_md5_test
  81  test_SCRIPTS  = transient-test.sh
  82