From 3b4f1aeeccb985fcb97e1fcd1df6c050e169dfb3 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Fri, 7 Sep 2012 12:55:48 +0200 Subject: [PATCH] Fix configure to work with multiarch distributions. --- configure.ac | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ead559c30c..2ae34ef8d2 100644 --- a/configure.ac +++ b/configure.ac @@ -76,7 +76,30 @@ case $prefix:$localstatedir in esac AC_SUBST([localstatedir]) -libdirname=`basename "$libdir"` +# sed_quote separator string +# Prefixes occurences of sed special characters and separator with \ in string. +# Suggested separators: , / (space) . +# Note that the character is prefixed with \ so characters that get special meaning +# will not work as separator. eg: n \ ? ( { ) } +sed_quote() +{ + echo -n "$2" | sed -e 's/\n/\\n/' -e 's|\([][*.$|'"$1"']\)|\\\1|g' +} + +# remove_dir_prefix prefix path +# Remove leading path prefix. +# Return directory name without leading slash (basename drop-in). +# Handle prefix trailing slash. +# // (double slash) is not handled. +remove_dir_prefix(){ + local prefix="$(sed_quote "," "$1")" + echo "$1" | grep -q '/$' || prefix="${prefix}/" + local re="^$(sed_quote "," "$prefix")" + echo "$2" | grep -q "$re" || re=/ + echo "$2" | sed -e "s,${re},," +} + +libdirname=`remove_dir_prefix '${exec_prefix}' "$libdir"` AC_SUBST([libdirname]) # The original default values of {bin,sbin,lib}dir -- 2.47.3