diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-06-17 13:44:10 -0400 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-06-26 04:36:47 -0700 |
| commit | f7b1245ca221fd7d4cee626ae358a2ebc933ffdd (patch) | |
| tree | 565477a07be9aaf891fbc858f74300d93bc1fdef /extras/init.d/Makefile.am | |
| parent | 183546aa2dbfe3371cf155800e2f70057e95e2bc (diff) | |
build: sync glusterfs.spec.in with Fedora glusterfs.spec
* add glusterfs-api and glusterfs-api-devel sub-packages
* add extras/systemd/glusterd.service. Use it (or extras/init.d/glusterd)
instead of the Fedora versions.
* restores ability to build glusterfs RPMs from the dist tarball with
'rpmbuild {-ts,-tb,-ta} glusterfs-XXX.tar.gz'
* other minor cleanups mostly to sync with fedora .spec and to build
from the dist tarball. Any differences will be resolved in the fedora
.spec in the next release (i.e. beta4 or GA).
(still considering whether to add fedora glusterfsd.{init,service} files
to glusterfs or remove them from fedora.)
BUG: 950083
Change-Id: Ibda3cd57b24ef5c2a27446703e718e5044ec546c
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/5230
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Bala FA <barumuga@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'extras/init.d/Makefile.am')
| -rw-r--r-- | extras/init.d/Makefile.am | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/extras/init.d/Makefile.am b/extras/init.d/Makefile.am index 7c26a0e8e2b..38898fddd2e 100644 --- a/extras/init.d/Makefile.am +++ b/extras/init.d/Makefile.am @@ -3,17 +3,20 @@ EXTRA_DIST = glusterd-Debian glusterd-Redhat glusterd-SuSE glusterd.plist rhel5- CLEANFILES = -initdir = @initdir@ -launchddir = @launchddir@ +INIT_DIR = @initdir@ +SYSTEMD_DIR = @systemddir@ +LAUNCHD_DIR = @launchddir@ $(GF_DISTRIBUTION): - $(mkdir_p) $(DESTDIR)$(initdir) - $(INSTALL_PROGRAM) glusterd-$(GF_DISTRIBUTION) $(DESTDIR)$(initdir)/glusterd + @if [ ! -d $(SYSTEMD_DIR) ]; then \ + $(mkdir_p) $(DESTDIR)$(INIT_DIR); \ + $(INSTALL_PROGRAM) glusterd-$(GF_DISTRIBUTION) $(DESTDIR)$(INIT_DIR)/glusterd; \ + fi install-exec-local: $(GF_DISTRIBUTION) install-data-local: if GF_DARWIN_HOST_OS - $(mkdir_p) $(DESTDIR)$(launchddir) - $(INSTALL_PROGRAM) glusterd.plist $(DESTDIR)$(launchddir)/com.gluster.glusterd.plist + $(mkdir_p) $(DESTDIR)$(LAUNCHD_DIR) + $(INSTALL_PROGRAM) glusterd.plist $(DESTDIR)$(LAUNCHD_DIR)/com.gluster.glusterd.plist endif |