* automake.in (handle_dist_worker): Expand DIST_COMMON under all

	conditions.
	(require_file_internal): Corrected arguments to second invocation
	of maybe_push_required_file.

diff --git a/ChangeLog b/ChangeLog
index 90cf1e29e45b271909de04b9f03460dc840208d0..ecff028ee96d65440976e265cac3dbe9b80b4614 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-12-19  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_dist_worker): Expand DIST_COMMON under all
+       conditions.
+       (require_file_internal): Corrected arguments to second invocation
+       of maybe_push_required_file.
+
        Fix for PR automake/9:
        * automake.in (make_dirs, make_dirs_set): New globals.
        (is_make_dir): New function.

diff --git a/automake.in b/automake.in
index 3f9b53c1f45f97c226be27f351a06618ddc25c8a..e9c34b5a2d2c755c450041208e33fe6663cf2607 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2618,7 +2618,7 @@ sub handle_dist_worker
 
     # We have to check DIST_COMMON for extra directories in case the
     # user put a source used in AC_OUTPUT into a subdir.
-    foreach (&variable_value_as_list ('DIST_COMMON', ''))
+    foreach (&variable_value_as_list ('DIST_COMMON', 'all'))
     {
        next if /^\@.*\@$/;
        next unless s,/+[^/]+$,,;
@@ -7509,7 +7509,8 @@ sub require_file_internal
                        }
                    }
 
-                   &maybe_push_required_file ($dir, $file, $fullfile);
+                   &maybe_push_required_file (&dirname ($errfile),
+                                              $errfile, $errfile);
                }
 
                local ($save) = $exit_status;