From: Tom Tromey <tromey@redhat.com>
Date: Sun, 19 Dec 1999 10:37:58 +0000 (+0000)
Subject: 	* automake.in (handle_dist_worker): Expand DIST_COMMON under all
X-Git-Tag: Release-1-4b~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=928d390950ec45504fb945c8258d4c9d0c525799;p=thirdparty%2Fautomake.git

	* 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 90cf1e29e..ecff028ee 100644
--- 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 3f9b53c1f..e9c34b5a2 100755
--- 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;