From e163bc5b3ab062e3cb22b0386dbe056ab4a54952 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Wed, 31 Aug 2011 16:03:28 +0200 Subject: s@GFS_PREFIX"/sbin@SBIN_DIR@ $sbindir is the install path for gluster* binaries, so this is what should be used in their invocation Change-Id: Ie748b4cbf59c3ee77f721ff6e0ab7151742ce0ab BUG: 2825 Reviewed-on: http://review.gluster.com/458 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- cli/src/Makefile.am | 2 +- cli/src/cli-rpc-ops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cli') diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index b50b7dbca..b76a9efd3 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -17,7 +17,7 @@ AM_CFLAGS = -fPIC -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\ -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS)\ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ - -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DGFS_PREFIX=\"$(prefix)\" + -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\" CLEANFILES = diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index c7bb2030e..ccd76d570 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -1478,7 +1478,7 @@ gf_cli3_1_print_limit_list (char *volname, char *limit_list, /* Mount a temporary client to fetch the disk usage * of the directory on which the limit is set. */ - ret = runcmd (GFS_PREFIX"/sbin/glusterfs", "-s", + ret = runcmd (SBIN_DIR"/glusterfs", "-s", "localhost", "--volfile-id", volname, "-l", DEFAULT_LOG_FILE_DIRECTORY"/quota-list.log", mountdir, NULL); -- cgit