From: Charles Wilson <cygwin@cwilson.fastmail.fm>
Date: Fri, 25 Nov 2005 18:31:53 +0000 (+0000)
Subject: * ltmain.in (link mode): add foo/bin for every foo/lib in
X-Git-Tag: release-1-5-22~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddce601ef9daa15d59651a4a68f19e1337f94eac;p=thirdparty%2Flibtool.git

* ltmain.in (link mode): add foo/bin for every foo/lib in
dllsearchpath when creating wrapper script.  Fixes
build-relink2 test failure.
Backport of CVS HEAD 2004-10-13.
---

diff --git a/ChangeLog b/ChangeLog
index b844b727c..fea58e7aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-25  Charles Wilson  <cygwin@cwilson.fastmail.fm>
+
+	* ltmain.in (link mode): add foo/bin for every foo/lib in
+	dllsearchpath when creating wrapper script.  Fixes
+	build-relink2 test failure.
+	Backport of CVS HEAD 2004-10-13.
+
 2005-11-25  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
 	* libtool.m4 [aix] <archive_expsym_cmds>
diff --git a/ltmain.in b/ltmain.in
index 1bd4dbbe1..44faae609 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -1472,10 +1472,15 @@ EOF
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
 	  ;;
 	esac
 	continue
@@ -4298,10 +4303,15 @@ EOF
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
 	  ;;
 	esac
       done