From 54d2cbc033dadcd017376584b70af5849146ee4f Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 1 Dec 2014 09:21:32 +0100 Subject: 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 > Signed-off-by: Niels de Vos > Reviewed-on: http://review.gluster.org/9221 > Reviewed-by: Humble Devassy Chirammal > Tested-by: Gluster Build System Change-Id: I1b6a352b73bd1ed1c5b330f54e26e81aed9a5a4e BUG: 1169004 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/9248 Tested-by: Gluster Build System Reviewed-by: Humble Devassy Chirammal Reviewed-by: Raghavendra Bhat Tested-by: Raghavendra Bhat --- extras/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extras') 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 \ -- cgit