summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2015-07-30 08:23:37 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-07-31 07:12:56 -0700
commit34517651a6c4507e389ffdb9ac83709bb3346a34 (patch)
tree9d8c349db7180da4808bbe42c5c34dc924d64abc
parente7f737e62a9ea9eac730b6ba3ef8739e497e1540 (diff)
build: scripts are not installed with +x bit
scripts listed in Makefile.am as foo_DATA, should be foo_SCRIPTS to be installed +x Change-Id: Ib9b98efcea968c03b574726bdc0d4f76cdfd1dc1 BUG: 1225018 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/11806 Reviewed-by: Niels de Vos <ndevos@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
-rw-r--r--extras/Makefile.am2
-rw-r--r--extras/ganesha/scripts/Makefile.am2
-rw-r--r--extras/geo-rep/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am
index ba2bef31420..6c11cb4b7a9 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -14,7 +14,7 @@ conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.con
voldir = $(sysconfdir)/glusterfs
vol_DATA = glusterd.vol
scriptsdir = $(datadir)/glusterfs/scripts
-scripts_DATA = post-upgrade-script-for-quota.sh \
+scripts_SCRIPTS = post-upgrade-script-for-quota.sh \
pre-upgrade-script-for-quota.sh stop-all-gluster-processes.sh
EXTRA_DIST = $(conf_DATA) specgen.scm glusterfs-mode.el glusterfs.vim \
diff --git a/extras/ganesha/scripts/Makefile.am b/extras/ganesha/scripts/Makefile.am
index f18ad66494d..e71e2f6456b 100644
--- a/extras/ganesha/scripts/Makefile.am
+++ b/extras/ganesha/scripts/Makefile.am
@@ -1,4 +1,4 @@
EXTRA_DIST= ganesha-ha.sh dbus-send.sh create-export-ganesha.sh
scriptsdir = $(libexecdir)/ganesha
-scripts_DATA = create-export-ganesha.sh dbus-send.sh ganesha-ha.sh
+scripts_SCRIPTS = create-export-ganesha.sh dbus-send.sh ganesha-ha.sh
diff --git a/extras/geo-rep/Makefile.am b/extras/geo-rep/Makefile.am
index 7ebede32686..662a84d4411 100644
--- a/extras/geo-rep/Makefile.am
+++ b/extras/geo-rep/Makefile.am
@@ -1,5 +1,5 @@
scriptsdir = $(datadir)/glusterfs/scripts
-scripts_DATA = gsync-upgrade.sh generate-gfid-file.sh get-gfid.sh \
+scripts_SCRIPTS = gsync-upgrade.sh generate-gfid-file.sh get-gfid.sh \
slave-upgrade.sh
scripts_PROGRAMS = gsync-sync-gfid