From 7e18e16f9f62ed95acded0fb3f2a8784087f59c0 Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Tue, 30 Aug 2016 18:36:51 +0530 Subject: 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 Change-Id: I0b7ebd8e2503de0cb79b601553c4405d0d1fd711 BUG: 1355956 Signed-off-by: Jiffin Tony Thottan Reviewed-on: http://review.gluster.org/15355 NetBSD-regression: NetBSD Build System Reviewed-by: soumya k Reviewed-by: Niels de Vos CentOS-regression: Gluster Build System Smoke: Gluster Build System --- xlators/mgmt/glusterd/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index faee8625d1c..33a1fc48a23 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) -- cgit