-rpath bug fix

diff --git a/ChangeLog b/ChangeLog
index e6ea303b734a8313cd90c72c9e532b9041e2bff6..084ba93e54ff02d007fe4569eb9039f4df57405f 100644 (file)
--- 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 e5daedfcae74df8b3491486caddb7227ecc1d1b7..d1b9319044f5614a45a5002c0924dd626cd8ac3e 100644 (file)
--- 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 732b2bf57993cf067ece3636b4bce29ddc9c0ed1..73062a59dac89cc8f311861bf82f53a3f0a8b8d6 100755 (executable)
--- 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 .=