diff options
| -rw-r--r-- | cli/src/Makefile.am | 3 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 2 | ||||
| -rw-r--r-- | glusterfs.spec.in | 2 | ||||
| -rw-r--r-- | heal/src/Makefile.am | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 1e27edd9054..16063f27c7f 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -20,7 +20,8 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\" + -DGLFSHEAL_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ + -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) AM_CFLAGS = -Wall $(GF_CFLAGS) $(XML_CFLAGS) diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 3793e5e8bfe..404f71752d3 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -2563,7 +2563,7 @@ cli_launch_glfs_heal(int heal_op, dict_t *options) runinit(&runner); ret = dict_get_str(options, "volname", &volname); - runner_add_args(&runner, SBIN_DIR "/glfsheal", volname, NULL); + runner_add_args(&runner, GLFSHEAL_PREFIX "/glfsheal", volname, NULL); runner_redir(&runner, STDOUT_FILENO, RUN_PIPE); switch (heal_op) { diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 7ff4294fc2d..e6cd3636861 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1305,7 +1305,7 @@ exit 0 # binaries %{_sbindir}/glusterd -%{_sbindir}/glfsheal +%{_libexecdir}/glusterfs/glfsheal %{_sbindir}/gf_attach %{_sbindir}/gluster-setgfid2path # {_sbindir}/glusterfsd is the actual binary, but glusterfs (client) is a 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) |