reapply andreys patch correctly.

diff --git a/ChangeLog b/ChangeLog
index 96ff1b02649d74098038d1e83e9e215ccd7fcca1..1e96f0fe362ab06916a7e15a44f907bfca43a1cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,16 @@
 1999-01-19  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
 
+       From Andrey Slepuhin <pooh@msu.ru>
+       * ltmain.in (hardcode_action) Oops, misapplied the patch!
+       
        * ltconfig.in (compile_dependencylbs): removed this
        variable and pick up the library dependencies from $deplibs.
        * ltmain.in (compile_dependencylibs): removed this
        variable, use deplibs to hold these dependencies.
 
        From Andrey Slepuhin <pooh@msu.ru>
-       (hardcode_action) make sure deplibs is set to include all the
-       extra libs added to compile_command.
+       * ltmain.in (hardcode_action) make sure deplibs is set to include
+       all the extra libs added to compile_command.
 
 1999-01-18  Alexandre Oliva  <oliva@dcc.unicamp.br>
 

diff --git a/ltmain.in b/ltmain.in
index 7b697dc28e3a33ad803bac7fbfb31d0cfec54f39..50d45e7601db1b9cbf1ae0214caa7186b9425a01 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1091,7 +1091,7 @@ compiler."
              deplibs="$deplibs $dir/$linklib"
            elif test "$hardcode_minus_L" = yes; then
              compile_command="$compile_command -L$dir -l$name"
-             deplibs="$deplibs $dir/$linklib"
+             deplibs="$deplibs -L$dir -l$name"
            elif test "$hardcode_shlibpath_var" = yes; then
              compile_shlibpath="$compile_shlibpath$dir:"
              compile_command="$compile_command -l$name"