* automake.in (generate_makefile): Call handle_dist after

	handle_dependencies and handle_tests.  Fixes subobj3.test and
	pr19.test regressions.

diff --git a/ChangeLog b/ChangeLog
index 6c39662a6499e66f35395270d9ee5689cbf226c7..0f710f306c458762ba258d6ccf99a7fdca28a7f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-19  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (generate_makefile): Call handle_dist after
+       handle_dependencies and handle_tests.  Fixes subobj3.test and
+       pr19.test regressions.
+
 2000-03-19  Gordon Matzigkeit  <gord@fig.org>
 
        * depend2.am (@EXT@.o): Look for the source file in srcdir as well

diff --git a/automake.in b/automake.in
index c560dc4cb7a3b6a13b5a54d963e6ee649199c4b8..af52cca8575e1367fff9bb7619e01580fe3259a7 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -646,9 +646,12 @@ sub generate_makefile
     &handle_subdirs;
     &handle_tags;
     &handle_minor_options;
-    &handle_dist ($makefile);
     &handle_dependencies;
     &handle_tests;
+
+    # This must come after most other rules.
+    &handle_dist ($makefile);
+
     &handle_footer;
     &handle_merge_targets ($output);
     &handle_installdirs;