diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-03-09 12:18:40 -0500 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-03-13 10:18:07 -0400 |
| commit | fdabb97d57793084190440b90c75c37761d5720c (patch) | |
| tree | a714e3f246598b9bd2e3480a751ce1f6f6cd65ca /events | |
| parent | fc97b1dc38ad46302d51a988cda18335f88514a2 (diff) | |
build/packaging: Debian and Ubuntu don't have /usr/libexec
GLUSTERFS_LIBEXECDIR is effectively hard-coded to /usr/libexec/glusterfs
in configure(.ac)
Debian-based distributions don't have a /usr/libexec/ directory
This issues is partially mitigated by the use of $libexecdir in
some of the Makefile.am files, but even so the incorrectly defined
GLUSTERFS_LIBEXECDIR results in various things such as gsyncd,
glusterfind, eventsd, etc., trying to invoke other scripts and
programs from a location that doesn't exist.
And once we correctly define GLUSTERFS_LIBEXECDIR, then we might as
well use it appropriatedly.
Change-Id: If5219cadc51ae316f7ba2e2831d739235c77902d
BUG: 1430841
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/16880
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Joe Julian <me@joejulian.name>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'events')
| -rw-r--r-- | events/src/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/events/src/Makefile.am b/events/src/Makefile.am index 87282c6c6f7..8493abdcd82 100644 --- a/events/src/Makefile.am +++ b/events/src/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = glustereventsd.py __init__.py eventsapiconf.py.in \ BUILT_SOURCES = eventtypes.py CLEANFILES = eventtypes.py -eventsdir = $(libexecdir)/glusterfs/events +eventsdir = $(GLUSTERFS_LIBEXECDIR)/events events_PYTHON = __init__.py gf_event.py eventsapiconf.py eventtypes.py \ utils.py @@ -13,7 +13,7 @@ eventtypes.py: $(top_srcdir)/events/eventskeygen.py $(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER if BUILD_EVENTS -eventspeerscriptdir = $(libexecdir)/glusterfs +eventspeerscriptdir = $(GLUSTERFS_LIBEXECDIR) eventsconfdir = $(sysconfdir)/glusterfs eventsconf_DATA = eventsconfig.json @@ -24,10 +24,10 @@ eventspeerscript_SCRIPTS = peer_eventsapi.py install-exec-hook: $(mkdir_p) $(DESTDIR)$(sbindir) rm -f $(DESTDIR)$(sbindir)/glustereventsd - ln -s $(libexecdir)/glusterfs/events/glustereventsd.py \ + ln -s $(GLUSTERFS_LIBEXECDIR)/events/glustereventsd.py \ $(DESTDIR)$(sbindir)/glustereventsd rm -f $(DESTDIR)$(sbindir)/gluster-eventsapi - ln -s $(libexecdir)/glusterfs/peer_eventsapi.py \ + ln -s $(GLUSTERFS_LIBEXECDIR)/peer_eventsapi.py \ $(DESTDIR)$(sbindir)/gluster-eventsapi uninstall-hook: |