summaryrefslogtreecommitdiffstats
path: root/heal
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2019-12-05 16:57:28 +0300
committerAmar Tumballi <amarts@gmail.com>2019-12-19 11:11:50 +0000
commitd8adc66b79de3f21672884539a65327614e0c6bb (patch)
treeec9f4dfec72a2d595375018afcd46a70c824aa48 /heal
parentbc6e206c6d29234a0b167b142d20c62ffd529f15 (diff)
glfsheal: install as architecture-dependent binary helper
Since glfsheal is a binary helper which is not intented to be invoked directly, install it under %{libexecdir}/glusterfs rather than %{sbindir}, adjust invocation from CLI code and RPM spec. Credits: Ravishankar N <ravishankar@redhat.com>. Fixes: bz#1780190 Change-Id: I4b41892d96b89c24a332470ac8c1e82f6795159a Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Diffstat (limited to 'heal')
-rw-r--r--heal/src/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/heal/src/Makefile.am b/heal/src/Makefile.am
index f04a294cc56..aa18d3eff88 100644
--- a/heal/src/Makefile.am
+++ b/heal/src/Makefile.am
@@ -1,5 +1,6 @@
if WITH_SERVER
-sbin_PROGRAMS = glfsheal
+scriptdir = $(GLUSTERFS_LIBEXECDIR)
+script_PROGRAMS = glfsheal
endif
glfsheal_SOURCES = glfs-heal.c
@@ -18,8 +19,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \
-I$(top_srcdir)/rpc/xdr/src\
-I$(top_builddir)/rpc/xdr/src\
-I$(top_srcdir)/api/src\
- -DDATADIR=\"$(localstatedir)\" \
- -DSBIN_DIR=\"$(sbindir)\"
+ -DDATADIR=\"$(localstatedir)\"
AM_CFLAGS = -Wall $(GF_CFLAGS) $(XML_CFLAGS)