* lib/depcomp (tru64): Expect dependency files in .libs/, maybe as

$base.lo.d, when libtool is used.
Reported by Nicolas Joly.

diff --git a/ChangeLog b/ChangeLog
index 03028f1a78bb3c5a0a450f97cb74b2686d8ca266..72ecae034c810d35326e0607f683e8b35c585b84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-12  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * lib/depcomp (tru64): Expect dependency files in .libs/, maybe as
+       $base.lo.d, when libtool is used.
+       Reported by Nicolas Joly.
+
 2002-06-11  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * lib/am/java.am (class%DIR%.stamp): Don't run $(JAVAC) when there

diff --git a/lib/depcomp b/lib/depcomp
index 094d6812978a711f5da6424831fd72902e9d8621..340abb153b23dccad156017bec9c8651f411080f 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -212,13 +212,17 @@ tru64)
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
    # dependencies in `foo.d' instead, so we check for that too.
    # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
-   base=`echo "$object" | sed -e 's/\.o$//' -e 's/\.lo$//'`
-   tmpdepfile1="$base.o.d"
-   tmpdepfile2="$base.d"
    if test "$libtool" = yes; then
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
       "$@" -MD
    fi