From: Peter O'Gorman <peter@pogma.com>
Date: Sat, 23 Oct 2004 12:04:34 +0000 (+0000)
Subject: * config/ltmain.m4sh (func_mode_link): Make Gary's new tests
X-Git-Tag: release-2-1b~891
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=596e2489bd174fd3b8c3fce721f136793f72c17d;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh (func_mode_link): Make Gary's new tests
pass. When the output wrapper script is not in the current
directory, we can not use an rpath which is relative to the
current directory. Use an absolute path instead.
---

diff --git a/ChangeLog b/ChangeLog
index 781508763..ef2619f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-23  Peter O'Gorman  <peter@pogma.com>
+
+	* config/ltmain.m4sh (func_mode_link): Make Gary's new tests
+	pass. When the output wrapper script is not in the current
+	directory, we can not use an rpath which is relative to the
+	current directory. Use an absolute path instead.
+
 2004-10-22  Gary V. Vaughan  <gary@gnu.org>
 
 	* clcommit.m4sh: Add --rcfile option.
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 4191b7fc5..5f41f0443 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -5495,7 +5495,17 @@ EOF
 	    ;;
 	  *)
 	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
+		case "$output" in
+		*[[\\/]]*)
+		  # the output file is not in the current dir
+		  # so we need an absolute path.
+		  absdir=`cd "$dir" && pwd`
+		  rpath="$rpath$absdir:"
+		  ;;
+		*)
+		  rpath="$rpath\$thisdir/$dir:"
+	      ;;
+	    esac
 	    ;;
 	  esac
 	done