dist -vs- dependencies bug

diff --git a/ChangeLog b/ChangeLog
index 8921ba9..bc52be1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 10 16:48:47 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (scan_dependency_file): Always use srcdir name as
+       passed in on command line.
+
 Thu May  1 12:53:46 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * automake.in (value_to_list): Don't fail when a variable

diff --git a/automake.in b/automake.in
index c82eda9..94d8813 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2563,26 +2563,9 @@ sub scan_dependency_file
     local ($just_file);
 
     local ($srcdir_rx, $fixup_rx);
-    # If the top srcdir is absolute, then the current directory is
-    # just relative_dir.  But if the top srcdir is relative, then we
-    # need to add some dots first.  The same holds when matching
-    # srcdir directly.
-    if ($srcdir_name =~ /^\//)
-    {
-       ($fixup_rx = $srcdir_name . '/' . $relative_dir . '/')
-           =~ s/(\W)/\\$1/g;
-       ($srcdir_rx = $srcdir_name . '/') =~ s/(\W)/\\$1/g;
-    }
-    else
-    {
-       ($fixup_rx = ($srcdir_name . '/' . $top_builddir . '/'
-                     . $relative_dir . '/')) =~ s/(\W)/\\$1/g;
-       $srcdir_rx = $srcdir_name . '/';
-       # Don't append a spurious "." to the regex.
-       $srcdir_rx .= $top_builddir
-           unless $top_builddir eq '.';
-       $srcdir_rx =~ s/(\W)/\\$1/g;
-    }
+    ($fixup_rx = $srcdir_name . '/' . $relative_dir . '/')
+       =~ s/(\W)/\\$1/g;
+    ($srcdir_rx = $srcdir_name . '/') =~ s/(\W)/\\$1/g;
 
     local ($rewrite_builddir) = (($top_builddir eq '.')
                                 ? ''