| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 |
- 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)
- This is because libdir has a trailing slash which breaks the comparision.
- RP 2/1/10
- Merged a patch received from Gary Thomas <gary@mlbassoc.com>
- Date: 2010/07/12
- Nitin A Kamble <nitin.a.kamble@intel.com>
- --- a/libltdl/config/ltmain.m4sh
- +++ b/libltdl/config/ltmain.m4sh
- @@ -2164,8 +2164,15 @@ func_mode_install ()
- func_append dir "$objdir"
-
- if test -n "$relink_command"; then
- + # Strip any trailing slash from the destination.
- + func_stripname '' '/' "$libdir"
- + destlibdir=$func_stripname_result
- +
- + func_stripname '' '/' "$destdir"
- + s_destdir=$func_stripname_result
- +
- # Determine the prefix the user has applied to our future dir.
- - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
- + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
-
- # Don't allow the user to place us outside of our expected
- # location b/c this prevents finding dependent libraries that
- --- a/libltdl/config/ltmain.sh
- +++ b/libltdl/config/ltmain.sh
- @@ -2953,8 +2953,15 @@ func_mode_install ()
- func_append dir "$objdir"
-
- if test -n "$relink_command"; then
- + # Strip any trailing slash from the destination.
- + func_stripname '' '/' "$libdir"
- + destlibdir=$func_stripname_result
- +
- + func_stripname '' '/' "$destdir"
- + s_destdir=$func_stripname_result
- +
- # Determine the prefix the user has applied to our future dir.
- - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
- + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
-
- # Don't allow the user to place us outside of our expected
- # location b/c this prevents finding dependent libraries that
|
