diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-12-23 13:57:14 +0100 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2015-12-26 09:31:24 -0800 |
| commit | 7ab8a1a3f4510a284b1686302624ec4252c95a6f (patch) | |
| tree | 70537e0ec4e3889635baa05a39b60b590802ac57 /extras | |
| parent | 618f130ed0e653566db34878b36a2db34dcd6723 (diff) | |
build: use 'make install' to install the hook scripts
The installation should be the same on all distributions, and doing
manual installation of files in the .spec is very ugly. This change adds
the rules so that 'make install' places the hook scripts in the right
location.
Also, the hook script(s) for NFS-Ganesha should be part of the
glusterfs-ganesha sub-package and got moved there.
BUG: 1174765
Change-Id: Iba25a7a5112c7d40db4c10ff4a5ac7a5fb4f7c4e
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/13072
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/hook-scripts/add-brick/post/Makefile.am | 3 | ||||
| -rw-r--r-- | extras/hook-scripts/add-brick/pre/Makefile.am | 3 | ||||
| -rw-r--r-- | extras/hook-scripts/reset/post/Makefile.am | 3 | ||||
| -rw-r--r-- | extras/hook-scripts/set/post/Makefile.am | 3 | ||||
| -rw-r--r-- | extras/hook-scripts/start/post/Makefile.am | 3 | ||||
| -rw-r--r-- | extras/hook-scripts/stop/pre/Makefile.am | 3 |
6 files changed, 18 insertions, 0 deletions
diff --git a/extras/hook-scripts/add-brick/post/Makefile.am b/extras/hook-scripts/add-brick/post/Makefile.am index 12f510291a9..5ca5a669de9 100644 --- a/extras/hook-scripts/add-brick/post/Makefile.am +++ b/extras/hook-scripts/add-brick/post/Makefile.am @@ -1 +1,4 @@ EXTRA_DIST = disabled-quota-root-xattr-heal.sh + +hookdir = $(GLUSTERD_WORKDIR)/hooks/1/add-brick/post/ +hook_SCRIPTS = disabled-quota-root-xattr-heal.sh diff --git a/extras/hook-scripts/add-brick/pre/Makefile.am b/extras/hook-scripts/add-brick/pre/Makefile.am index 4d22d3c489b..6329ad1d4bd 100644 --- a/extras/hook-scripts/add-brick/pre/Makefile.am +++ b/extras/hook-scripts/add-brick/pre/Makefile.am @@ -1 +1,4 @@ EXTRA_DIST = S28Quota-enable-root-xattr-heal.sh + +hookdir = $(GLUSTERD_WORKDIR)/hooks/1/add-brick/pre/ +hook_SCRIPTS = S28Quota-enable-root-xattr-heal.sh diff --git a/extras/hook-scripts/reset/post/Makefile.am b/extras/hook-scripts/reset/post/Makefile.am index fcdd8ab55ba..bb28d990596 100644 --- a/extras/hook-scripts/reset/post/Makefile.am +++ b/extras/hook-scripts/reset/post/Makefile.am @@ -1 +1,4 @@ EXTRA_DIST = S31ganesha-reset.sh + +hookdir = $(GLUSTERD_WORKDIR)/hooks/1/reset/post/ +hook_SCRIPTS = S31ganesha-reset.sh diff --git a/extras/hook-scripts/set/post/Makefile.am b/extras/hook-scripts/set/post/Makefile.am index db86bc2eb51..cea579cb2d9 100644 --- a/extras/hook-scripts/set/post/Makefile.am +++ b/extras/hook-scripts/set/post/Makefile.am @@ -1 +1,4 @@ EXTRA_DIST = S30samba-set.sh S32gluster_enable_shared_storage.sh + +hookdir = $(GLUSTERD_WORKDIR)/hooks/1/set/post/ +hook_SCRIPTS = $(EXTRA_DIST) diff --git a/extras/hook-scripts/start/post/Makefile.am b/extras/hook-scripts/start/post/Makefile.am index ad53233b1c9..03bb300c5c2 100644 --- a/extras/hook-scripts/start/post/Makefile.am +++ b/extras/hook-scripts/start/post/Makefile.am @@ -1 +1,4 @@ EXTRA_DIST = S29CTDBsetup.sh S30samba-start.sh S31ganesha-start.sh + +hookdir = $(GLUSTERD_WORKDIR)/hooks/1/start/post/ +hook_SCRIPTS = $(EXTRA_DIST) diff --git a/extras/hook-scripts/stop/pre/Makefile.am b/extras/hook-scripts/stop/pre/Makefile.am index 85243adbec9..bf63e7393d3 100644 --- a/extras/hook-scripts/stop/pre/Makefile.am +++ b/extras/hook-scripts/stop/pre/Makefile.am @@ -1 +1,4 @@ EXTRA_DIST = S29CTDB-teardown.sh S30samba-stop.sh + +hookdir = $(GLUSTERD_WORKDIR)/hooks/1/stop/pre/ +hook_SCRIPTS = $(EXTRA_DIST) |