avoid automake rules in dist in more situations

diff --git a/ChangeLog b/ChangeLog
index 00aa5a2bcf83686c6a10aa3a7a5d6d714b2c9374..b4c2460611683a10181c1ab93b6f61b0699641f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Thu Mar 27 17:28:47 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_dist_worker): Avoid automake rules in
+       generated Makefile when no-dependencies specified.  From Greg
+       Woods.
+
        * m4/lispdir.m4: Don't AC_SUBST ELCFILES.  From Greg Woods.
 
        * texi-vers.am (stamp-@VTI@): Make commands silent.

diff --git a/automake.in b/automake.in
index 6de55ef21ca914255d15dd3e19c2fa791ca97278..1f786e1eb3464d8e5575585a09aac2d2ff2d0988 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2124,10 +2124,10 @@ sub handle_dist_worker
        -chmod 755 $(distdir)
 ';
 
-       # Only run automake in `dist' target if --include-deps not
-       # specified.  That way the recipient of a distribution can run
-       # "make dist" and not need Automake.
-       if ($cmdline_use_dependencies)
+       # Only run automake in `dist' target if --include-deps and
+       # `no-dependencies' not specified.  That way the recipient of
+       # a distribution can run "make dist" and not need Automake.
+       if ($use_dependencies)
        {
            $output_rules .=
                (