aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomi Ollila <tomi.ollila@iki.fi>2017-01-01 19:20:30 +0200
committerDavid Bremner <david@tethera.net>2017-01-01 18:15:58 -0400
commitc8934806548ca8c2f60d1150606f67da27cb2546 (patch)
tree7a86d14e4787993df5ea92b318f40d6340efff95
parent4dde1e677473faa6588909396820f9948e28923f (diff)
configure: fix $prefix expansion for libdir_expanded
Since the sed expansion line which did $prefix expansion for libdir_expanded was changed from the legacy `...` format to the new $(...) expression, the subtle backslash expansion change went unnoticed -- \\$ which used to escape '$' now escapes '\' and the following '$prefix' was attempted to expand as a variable. So changing \\$ to \$ fixes this. Also, replaced echo with printf %s -- echo does expansions of its own. While at it, the following 2 inconsistencies were fixed: 1) the /g flag was removed from first expression; second didn't have it 2) first expression did not end with /, so "dropped" it from second configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 2a0ce9eb..f1773044 100755
--- a/configure
+++ b/configure
@@ -274,7 +274,7 @@ 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")
+ libdir_expanded=$(printf %s "$LIBDIR" | sed "s|\${prefix}|${PREFIX}|; s|\$prefix\>|${PREFIX}|; s|//*|/|g")
fi
cat <<EOF