summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile.am5
-rw-r--r--extras/Makefile.am5
-rw-r--r--extras/glusterd.vol (renamed from doc/glusterd.vol)0
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0f9feb250b7..1103b607dba 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,6 @@
-EXTRA_DIST = glusterfs.8 mount.glusterfs.8 glusterd.vol gluster.8 \
+EXTRA_DIST = glusterfs.8 mount.glusterfs.8 gluster.8 \
glusterd.8 glusterfsd.8
-voldir = $(sysconfdir)/glusterfs
-vol_DATA = glusterd.vol
-
man8_MANS = glusterfs.8 mount.glusterfs.8 gluster.8 glusterd.8 glusterfsd.8
CLEANFILES =
diff --git a/extras/Makefile.am b/extras/Makefile.am
index bfd9101be0d..1ccd9dbd9bf 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -8,9 +8,12 @@ confdir = $(sysconfdir)/glusterfs
conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \
logger.conf.example
+voldir = $(sysconfdir)/glusterfs
+vol_DATA = glusterd.vol
+
EXTRA_DIST = specgen.scm MacOSX/Portfile glusterfs-mode.el glusterfs.vim \
migrate-unify-to-distribute.sh backend-xattr-sanitize.sh \
backend-cleanup.sh disk_usage_sync.sh quota-remove-xattr.sh \
quota-metadata-cleanup.sh glusterfs-logrotate clear_xattrs.sh \
group-virt.example glusterd-sysconfig gluster-rsyslog-7.2.conf \
- gluster-rsyslog-5.8.conf logger.conf.example
+ gluster-rsyslog-5.8.conf logger.conf.example glusterd.vol
diff --git a/doc/glusterd.vol b/extras/glusterd.vol
index de17d8fd8f9..de17d8fd8f9 100644
--- a/doc/glusterd.vol
+++ b/extras/glusterd.vol