aboutsummaryrefslogtreecommitdiffhomepage
path: root/configure
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2012-11-28 08:25:52 -0400
committerGravatar David Bremner <bremner@debian.org>2012-12-01 08:04:30 -0400
commit3c6b2d5071fb71035d5d8cfd24b3bb843840eb9b (patch)
treebb306fb6d433b8050ddedb993119f35a48e09353 /configure
parenta4eabfd1b7b6c72af09153df082bac3dca7c4420 (diff)
configure: really expand libdir_expanded
It turns out that if people really use configure in autotools style and pass libdir containing '${prefix}/foo' then the ldconfig previously failed. This uses sed for portability (versus bash parameter expansion with substitution) and hopefully a bit more robustness than blindly parameter expanding the string.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index ea8a1ad5..460fcfcf 100755
--- a/configure
+++ b/configure
@@ -236,7 +236,12 @@ done
# Makefile.config file later like most values), because we need to
# actually investigate this value compared to the ldconfig_paths value
# below.
-libdir_expanded=${LIBDIR:-${PREFIX}/lib}
+if [ -z "$LIBDIR" ] ; then
+ libdir_expanded="${PREFIX}/lib"
+else
+ # very non-general variable expansion
+ libdir_expanded=`echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g"`
+fi
cat <<EOF
Welcome to Notmuch, a system for indexing, searching and tagging your email.