From 156adda8bd58d8963abcde3cb5acb88229e525be Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 12 Jun 2002 16:37:34 +0000 Subject: [PATCH] * lib/depcomp (tru64): Expect dependency files in .libs/, maybe as $base.lo.d, when libtool is used. Reported by Nicolas Joly. --- ChangeLog | 6 ++++++ lib/depcomp | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03028f1a7..72ecae034 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-06-12 Alexandre Duret-Lutz + + * 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 * lib/am/java.am (class%DIR%.stamp): Don't run $(JAVAC) when there diff --git a/lib/depcomp b/lib/depcomp index 094d68129..340abb153 100755 --- 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 -- 2.47.2