From d772a79d6fac46426b5eaa6a307bac74f4e8033f Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 9 Mar 2017 12:34:41 -0500 Subject: 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. master change https://review.gluster.org/16880 master BZ: 1430841 release-3.10 change https://review.gluster.org/16881 release-3.10 BZ: 1430845 Change-Id: If5219cadc51ae316f7ba2e2831d739235c77902d BUG: 1430845 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: https://review.gluster.org/16882 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Milind Changire --- cli/src/Makefile.am | 2 +- configure.ac | 12 ++++++------ extras/Makefile.am | 2 +- geo-replication/src/Makefile.am | 4 ++-- geo-replication/syncdaemon/Makefile.am | 2 +- tools/gfind_missing_files/Makefile.am | 4 ++-- tools/glusterfind/Makefile.am | 4 ++-- tools/glusterfind/src/Makefile.am | 2 +- xlators/features/ganesha/src/Makefile.am | 2 +- xlators/mgmt/glusterd/src/Makefile.am | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 91819d111e3..8e47e209056 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -17,7 +17,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/rpc/xdr/src\ -DDATADIR=\"$(localstatedir)\" \ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \ - -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ + -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\ $(XML_CPPFLAGS) diff --git a/configure.ac b/configure.ac index 5a7231262d9..1ab3c996d3c 100644 --- a/configure.ac +++ b/configure.ac @@ -974,24 +974,24 @@ old_prefix=$prefix if test "x$prefix" = xNONE; then prefix=$ac_default_prefix fi -GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs" -GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" +GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs" +GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd" prefix=$old_prefix ### Dirty hacky stuff to make LOCALSTATEDIR work if test "x$prefix" = xNONE; then - test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var + test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var localstatedir=/var - LOCALSTATEDIR=$(eval echo ${localstatedir}) + LOCALSTATEDIR=$localstatedir else - LOCALSTATEDIR=$(eval echo ${localstatedir}) + LOCALSTATEDIR=$localstatedir fi old_prefix=$prefix if test "x$prefix" = xNONE; then prefix=$ac_default_prefix fi -GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol" +GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol" prefix=$old_prefix diff --git a/extras/Makefile.am b/extras/Makefile.am index 609d497f5b8..5ebb45a9a79 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -1,4 +1,4 @@ -addonexecdir = $(libexecdir)/glusterfs +addonexecdir = $(GLUSTERFS_LIBEXECDIR) addonexec_SCRIPTS = peer_add_secret_pub EditorModedir = $(docdir) diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am index 1572698f8ae..04355bf8d52 100644 --- a/geo-replication/src/Makefile.am +++ b/geo-replication/src/Makefile.am @@ -1,4 +1,4 @@ -gsyncddir = $(libexecdir)/glusterfs +gsyncddir = $(GLUSTERFS_LIBEXECDIR) gsyncd_SCRIPTS = gverify.sh peer_gsec_create \ set_geo_rep_pem_keys.sh peer_mountbroker @@ -19,7 +19,7 @@ noinst_HEADERS = procdiggy.h AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src\ - -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\ + -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\ -DUSE_LIBGLUSTERFS\ -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\" diff --git a/geo-replication/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am index ed0f5e40924..6449d9ecc18 100644 --- a/geo-replication/syncdaemon/Makefile.am +++ b/geo-replication/syncdaemon/Makefile.am @@ -1,4 +1,4 @@ -syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon +syncdaemondir = $(GLUSTERFS_LIBEXECDIR)/python/syncdaemon syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py \ resource.py configinterface.py syncdutils.py monitor.py libcxattr.py \ diff --git a/tools/gfind_missing_files/Makefile.am b/tools/gfind_missing_files/Makefile.am index 043c34c4182..f77f7899efb 100644 --- a/tools/gfind_missing_files/Makefile.am +++ b/tools/gfind_missing_files/Makefile.am @@ -1,4 +1,4 @@ -gfindmissingfilesdir = $(libexecdir)/glusterfs/gfind_missing_files +gfindmissingfilesdir = $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files gfindmissingfiles_SCRIPTS = gfind_missing_files.sh gfid_to_path.sh \ gfid_to_path.py @@ -21,6 +21,6 @@ uninstall-local: install-data-local: rm -f $(DESTDIR)$(sbindir)/gfind_missing_files - ln -s $(libexecdir)/glusterfs/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files + ln -s $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files CLEANFILES = diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am index 37f23bed1bb..92fa61461ad 100644 --- a/tools/glusterfind/Makefile.am +++ b/tools/glusterfind/Makefile.am @@ -6,7 +6,7 @@ bin_SCRIPTS = glusterfind CLEANFILES = $(bin_SCRIPTS) -deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/ +deletehookscriptsdir = $(GLUSTERFS_LIBEXECDIR)/glusterfind/ deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py uninstall-local: @@ -16,5 +16,5 @@ install-data-local: $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/ rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post - ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \ + ln -s $(GLUSTERFS_LIBEXECDIR)/glusterfind/S57glusterfind-delete-post.py \ $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post diff --git a/tools/glusterfind/src/Makefile.am b/tools/glusterfind/src/Makefile.am index 541ff946c04..e4469c1c0cf 100644 --- a/tools/glusterfind/src/Makefile.am +++ b/tools/glusterfind/src/Makefile.am @@ -1,4 +1,4 @@ -glusterfinddir = $(libexecdir)/glusterfs/glusterfind +glusterfinddir = $(GLUSTERFS_LIBEXECDIR)/glusterfind glusterfind_PYTHON = conf.py utils.py __init__.py \ main.py libgfchangelog.py changelogdata.py diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am index 3bf291b92c6..be2f45c6d43 100644 --- a/xlators/features/ganesha/src/Makefile.am +++ b/xlators/features/ganesha/src/Makefile.am @@ -11,7 +11,7 @@ ganesha_la_SOURCES = ganesha.c AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\ -DGANESHA_DIR=\"$(sysconfdir)/ganesha\" \ - -DGYSNCD_PREFIX=\"$(libexecdir)/glusterfs\" + -DGYSNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" AM_CFLAGS = -Wall $(GF_CFLAGS) diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index f938aaf9436..d20fcefd97d 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -46,7 +46,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(CONTRIBDIR)/mount \ -I$(CONTRIBDIR)/userspace-rcu \ -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \ - -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \ + -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" \ -DCONFDIR=\"$(sysconfdir)/ganesha\" \ -DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS) -- cgit