* lib/depcomp (tru64) [libtool]: Use $dir$base.o.d instead

of $dir.libs/$base.o.d.  Libtool 1.5 causes both to be output,
and we will clean the second automatically during distclean.
Using the latter and leaving the former as we did before cause
"files left in build directory" failures during distcheck.
Suggested by Nicolas Joly.

diff --git a/ChangeLog b/ChangeLog
index ca3208029d5a796164adca238e25f3d0ddfa68fe..ee2a088db280044af3200b84841dd779735a06f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-05-31  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * lib/depcomp (tru64) [libtool]: Use $dir$base.o.d instead
+       of $dir.libs/$base.o.d.  Libtool 1.5 causes both to be output,
+       and we will clean the second automatically during distclean.
+       Using the latter and leaving the former as we did before cause
+       "files left in build directory" failures during distcheck.
+       Suggested by Nicolas Joly.
+
        * doc/automake.texi (Built sources example): Explain what
        nodist_foo_SOURCES is (not) useful to, and use it in all the
        examples.

diff --git a/lib/depcomp b/lib/depcomp
index b966ddd8c75c520c026991cfa29803d7ff03532b..11e2d3bfe1cffc0cfc75109ac2ab67c6fbb26feb 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2004-04-25.14
+scriptversion=2004-05-31.23
 
 # Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 
@@ -288,9 +288,12 @@ tru64)
 
    if test "$libtool" = yes; then
       # Dependencies are output in .lo.d with libtool 1.4.
-      # They are output in .o.d with libtool 1.5.
+      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # latter, because the former will be cleaned when $dir.libs is
+      # erased.
       tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.o.d"
+      tmpdepfile2="$dir$base.o.d"
       tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else