path: root/glusterfsd
diff options
authorHarshavardhana <>2014-08-14 13:06:26 -0700
committerHarshavardhana <>2014-09-03 11:01:45 -0700
commit025ae07850375cbf981ed335a4ddf702d54be6e3 (patch)
treea119246764dc98f0d0c7fb87572cd1b01bc18684 /glusterfsd
parent845d6c76701a3de6a11b76b004176971411c714e (diff)
build: make GLUSTERD_WORKDIR rely on localstatedir
Backport from master branch - - 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: I06e684ac4c26d1e74c9daf76753403ad15f79276 BUG: 1130308 Signed-off-by: Harshavardhana <> 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