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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 3d796a01128..6d9013d539b 100644 --- a/configure.ac +++ b/configure.ac @@ -1094,24 +1094,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 |