* automake.in (handle_single_transform_list): Use $(DEPDIR)

	instead of hardcoding '.deps'.
	* m4/depend.m4 (AM_SET_DEPDIR): Sync with libtool's libdir check.

diff --git a/ChangeLog b/ChangeLog
index 77cc721c922fdbb790249f1aee6c32fdb76b9bfb..25b4bf9bfcc4ce9c230adc3aca8460bd700892a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-21  Tim Van Holder  <tim.van.holder@pandora.be>
+
+       * automake.in (handle_single_transform_list): Use $(DEPDIR)
+       instead of hardcoding '.deps'.
+       * m4/depend.m4 (AM_SET_DEPDIR): Sync with libtool's libdir check.
+
 2001-07-20  Derek Price  <dprice@collab.net>
 
        * m4/header.m4 (AM_CONFIG_HEADER): Create stamp-h files in the correct

diff --git a/automake.in b/automake.in
index f5b444356dde8b67886f545434f185f1b44e09cc..fc52d420ea526ac1b5129fe34229533e2f3eea56 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2006,7 +2006,7 @@ sub handle_single_transform_list ($$$@)
                 # If we're generating dependencies, we also want
                 # to make sure that the appropriate subdir of the
                 # .deps directory is created.
-               push (@dep_list, &require_build_directory (".deps/$directory"))
+               push (@dep_list, &require_build_directory ('$(DEPDIR)/' . $directory))
                    if ($use_dependencies);
             }
 

diff --git a/m4/depend.m4 b/m4/depend.m4
index c57c2e96bbf46d50976ff9e5b818e7e5a5d45499..106004847ada38137f05f4f8d5f0b9ab72633e19 100644 (file)
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -98,14 +98,15 @@ AC_SUBST([$1DEPMODE])
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
-[if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
   DEPDIR=.deps
-  # We redirect because .deps might already exist and be populated.
-  # In this situation we don't want to see an error.
-  rmdir .deps > /dev/null 2>&1
 else
+  # MS-DOS does not allow filenames that begin with a dot.
   DEPDIR=_deps
 fi
+rmdir .deps 2>/dev/null
 AC_SUBST(DEPDIR)
 ])