debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-02 23:01:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: really expand libdir_expanded

Browse source 
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.
This commit is contained in:
David Bremner 2012-11-28 08:25:52 -04:00
parent a4eabfd1b7
commit 3c6b2d5071
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure vendored
View file

@ -236,7 +236,12 @@ done
# Makefile.config file later like most values), because we need to # Makefile.config file later like most values), because we need to
# actually investigate this value compared to the ldconfig_paths value # actually investigate this value compared to the ldconfig_paths value
# below. # 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 cat <<EOF
Welcome to Notmuch, a system for indexing, searching and tagging your email. Welcome to Notmuch, a system for indexing, searching and tagging your email.