14aa27be860944dce474d9bcb464ade832f2e265
[openwrt/svn-archive/archive.git] / tools / libtool / patches / 150-trailingslash.patch
1 A command like /bin/sh ../../i586-poky-linux-libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio)
2
3 This is because libdir has a trailing slash which breaks the comparision.
4
5 RP 2/1/10
6
7 Merged a patch received from Gary Thomas <gary@mlbassoc.com>
8
9 Date: 2010/07/12
10 Nitin A Kamble <nitin.a.kamble@intel.com>
11
12 --- a/libltdl/config/ltmain.m4sh
13 +++ b/libltdl/config/ltmain.m4sh
14 @@ -2164,8 +2164,15 @@ func_mode_install ()
15 func_append dir "$objdir"
16
17 if test -n "$relink_command"; then
18 + # Strip any trailing slash from the destination.
19 + func_stripname '' '/' "$libdir"
20 + destlibdir=$func_stripname_result
21 +
22 + func_stripname '' '/' "$destdir"
23 + s_destdir=$func_stripname_result
24 +
25 # Determine the prefix the user has applied to our future dir.
26 - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
27 + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
28
29 # Don't allow the user to place us outside of our expected
30 # location b/c this prevents finding dependent libraries that