diff options
| author | Csaba Henk <csaba@redhat.com> | 2017-04-21 19:11:24 +0200 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-05-24 00:16:24 +0000 |
| commit | 7e962090a074f298e021ef2d8f6c1e303c022eaf (patch) | |
| tree | be9fe16ed007b3b286191b358d1b1adceeca6668 | |
| parent | 176e956c44de46998394a426d8b2451c4fa7ea35 (diff) | |
build: ensure autoconf template expansions resolve variables
Make sure the following autotools managed variables:
GLUSTERFS_LIBEXECDIR
GLUSTERD_MISCDIR
GLUSTERD_VOLFILE
LOCALSTATEDIR
get expanded to literal paths when the configure
script generates the installed versions of certain
text files from *.in templates.
This change is partly implemented by restoring some of
the "eval echo $variable" style forced expansions in
configure that were removed in
mainline BUG: 1444228
master https://review.gluster.org/17096
Change-Id: I3b31b1259c5101252bbc37861683894e6eae29e6
BUG: 1450947
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Signed-off-by: Csaba Henk <csaba@redhat.com>
Reviewed-on: https://review.gluster.org/17298
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>
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c9742e2560e..0eebcda7b6b 100644 --- a/configure.ac +++ b/configure.ac @@ -1056,24 +1056,28 @@ old_prefix=$prefix if test "x$prefix" = xNONE; then prefix=$ac_default_prefix fi -GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs" -GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd" +old_exec_prefix=$exec_prefix +if test "x$exec_prefix" = xNONE; then + exec_prefix="$(eval echo $prefix)" +fi +GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" +GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" prefix=$old_prefix +exec_prefix=$old_exec_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=$localstatedir -else - LOCALSTATEDIR=$localstatedir fi +localstatedir="$(eval echo ${localstatedir})" +LOCALSTATEDIR=$localstatedir old_prefix=$prefix if test "x$prefix" = xNONE; then prefix=$ac_default_prefix fi -GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol" +GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol" prefix=$old_prefix |