path: root/glusterfsd
diff options
authorHarshavardhana <>2014-06-29 18:56:44 -0700
committerHarshavardhana <>2014-08-07 01:17:29 -0700
commit2ec6ea43f2ddc6c00a030be6d04c00f0924277b7 (patch)
treeb2d98cd8c4760c1af44c8b6a70661fe5566ce6da /glusterfsd
parentf29da9bcc812e3d0711005ce86051d70c277a165 (diff)
build: make GLUSTERD_WORKDIR rely on localstatedir
- Break-way from '/var/lib/glusterd' hard-coded previously, instead rely on 'configure' value from 'localstatedir' - Provide 's/lib/db' as default working directory for gluster management daemon for BSD and Darwin based installations - loff_t is really off_t on Darwin - fix-off the warnings generated by clang on FreeBSD/Darwin - Now 'tests/*' use GLUSTERD_WORKDIR a common variable for all platforms. - Define proper environment for running tests, define correct PATH and LD_LIBRARY_PATH when running tests, so that the desired version of glusterfs is used, regardless where it is installed. (Thanks to for this additional work) Change-Id: I2339a0d9275de5939ccad3e52b535598064a35e7 BUG: 1111774 Signed-off-by: Harshavardhana <> Signed-off-by: Emmanuel Dreyfus <> Reviewed-on: Tested-by: Gluster Build System <>
Diffstat (limited to 'glusterfsd')
1 files changed, 2 insertions, 2 deletions
diff --git a/glusterfsd/src/ b/glusterfsd/src/
index e66d8ed..a2f05b6 100644
--- a/glusterfsd/src/
+++ b/glusterfsd/src/
@@ -3,8 +3,8 @@ sbin_PROGRAMS = glusterfsd
glusterfsd_SOURCES = glusterfsd.c glusterfsd-mgmt.c
glusterfsd_LDADD = $(top_builddir)/libglusterfs/src/ \
$(top_builddir)/rpc/rpc-lib/src/ \
- $(top_builddir)/rpc/xdr/src/ \
+ $(top_builddir)/rpc/xdr/src/ ${GF_LDADD}
glusterfsd_LDFLAGS = $(GF_LDFLAGS)
noinst_HEADERS = glusterfsd.h glusterfsd-mem-types.h glusterfsd-messages.h