From: Tom Tromey <tromey@redhat.com>
Date: Thu, 10 Apr 1997 06:12:28 +0000 (+0000)
Subject: -rpath bug fix
X-Git-Tag: pre-ian-conditionals~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7e863a7bc1c9745dcff44710654760b9a8a4b09;p=thirdparty%2Fautomake.git

-rpath bug fix
---

diff --git a/ChangeLog b/ChangeLog
index e6ea303b7..084ba93e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr  9 17:09:40 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (handle_ltlibraries): Use correct rpath
+	substitution.  Bug from Jim Blandy.
+
 Mon Apr  7 17:40:18 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (AM_INIT_AUTOMAKE_PATTERN): Fixed for new 3rd arg.
diff --git a/TODO b/TODO
index e5daedfca..d1b931904 100644
--- a/TODO
+++ b/TODO
@@ -347,6 +347,8 @@ containing application.
 
 Document:
 
+LTLIBOBJS
+
 AM_MISSING_PROG
 
 how to use the generated makefiles
diff --git a/automake.in b/automake.in
index 732b2bf57..73062a59d 100755
--- a/automake.in
+++ b/automake.in
@@ -1676,7 +1676,8 @@ sub handle_ltlibraries
 	}
 	else
 	{
-	    $rpath = 's/\@RPATH\@/-rpath ' . $instdirs{$onelib} . '/go;';
+	    $rpath = ('s/\@RPATH\@/-rpath \$(' . $instdirs{$onelib}
+		      . 'dir)/go;');
 	}
 
 	$output_rules .=