summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2014-12-01 09:21:32 +0100
committerRaghavendra Bhat <raghavendra@redhat.com>2014-12-10 06:00:22 -0800
commit54d2cbc033dadcd017376584b70af5849146ee4f (patch)
tree26db62fa06865b3eb7f1b87920d21b13d6622b2e /extras
parentbfc9f1f8d94db1d666e549f3e382be75839c1bf7 (diff)
build: only install geo-rep scripts when enabled
When geo-replication is not enabled, the related scripts should not get installed. EPEL-5 does not support geo-replication, and the installed but unpackaged scripts cause rebuilding for .el5 to fail. Cherry picked from commit fcdac758ad7b3dda9843f92597a15e4a30a3b746: > BUG: 1169005 > Change-Id: I1b6a352b73bd1ed1c5b330f54e26e81aed9a5a4e > Reported-by: Lalatendu Mohanty <lmohanty@redhat.com> > Signed-off-by: Niels de Vos <ndevos@redhat.com> > Reviewed-on: http://review.gluster.org/9221 > Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com> > Tested-by: Gluster Build System <jenkins@build.gluster.com> Change-Id: I1b6a352b73bd1ed1c5b330f54e26e81aed9a5a4e BUG: 1169004 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/9248 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com> Tested-by: Raghavendra Bhat <raghavendra@redhat.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am
index b6cdb90434f..a163b1ae3a2 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -2,7 +2,7 @@ EditorModedir = $(docdir)
EditorMode_DATA = glusterfs-mode.el glusterfs.vim
SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \
- geo-rep
+ $(GEOREP_EXTRAS_SUBDIR)
confdir = $(sysconfdir)/glusterfs
conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \