From fd2b5cb2ba62aac2bf1c466074f233ec17168594 Mon Sep 17 00:00:00 2001
From: Jiffin Tony Thottan <jthottan@redhat.com>
Date: Tue, 30 Aug 2016 18:36:51 +0530
Subject: [PATCH 68/86] ganesha/glusterd : Correct the path for ganesha conf dir in Makefile
The value for ganesha conf dir in Makefile.am is mistakenly entered as
following :
DCONFDIR=\"/$(runstatedir)/gluster/shared_storage/nfs-ganesha\"
Here value for runstatedir is seems to "NULL" which results wrong path
for ganesha configuration directory
Upstream reference :
>Change-Id: I0b7ebd8e2503de0cb79b601553c4405d0d1fd711
>BUG: 1355956
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
>Reviewed-on: http://review.gluster.org/15355
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>Reviewed-by: soumya k <skoduri@redhat.com>
>Reviewed-by: Niels de Vos <ndevos@redhat.com>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Change-Id: I0b7ebd8e2503de0cb79b601553c4405d0d1fd711
BUG: 1348949
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/84840
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
xlators/mgmt/glusterd/src/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
index faee862..33a1fc4 100644
--- a/xlators/mgmt/glusterd/src/Makefile.am
+++ b/xlators/mgmt/glusterd/src/Makefile.am
@@ -48,7 +48,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
-I$(CONTRIBDIR)/userspace-rcu \
-DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \
-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \
- -DCONFDIR=\"/$(runstatedir)/gluster/shared_storage/nfs-ganesha\" \
+ -DCONFDIR=\"$(localstatedir)/run/gluster/shared_storage/nfs-ganesha\" \
-DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \
-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS)
--
1.7.1