More bug fixes

diff --git a/ChangeLog b/ChangeLog
index 387a310c548f52cbcc7581ca08778ee843ddfcef..431b00b0ec11ace8a0059c5ebbf992aee68c8732 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 Fri Jul  5 08:23:00 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * subdirs.am (maintainer-clean-recursive): Don't be so noisy.
+       Report from Josh MacDonald.
+
+       Bugs from Gord Matzigkeit:
+       * automake.in (handle_footer): Push contents of $(SUFFIXES), not
+       `$(SUFFIXES)'.
+       (handle_dist): Ignore chmod return results.
+
        * programs-clean.am (clean-@DIR@PROGRAMS): Work around failing
        Solaris "rm -f".  Bug from Kaveh R. Ghazi.
        * libraries-clean.am (clean-@DIR@LIBRARIES): Likewise.

diff --git a/TODO b/TODO
index 2d8ac8e52e105b9f9d298ffc0f66e159acf6f977..30737c88d8b08b50582794ba1140d23951a3a975 100644 (file)
--- a/TODO
+++ b/TODO
@@ -301,6 +301,10 @@ non-automake-using subdirs
 
 document actual uses of PACKAGE and VERSION
 
+> Oh, ok.  This should be documented: make the last argument of your
+> AC_OUTPUT line look like this:
+> 
+>     test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 
 ================================================================
 

diff --git a/automake.in b/automake.in
index c320d15549424259a8d29573d2c7f1286a5fb3c8..20267097834b1a4a69e8d569aa0a59d683b90550 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1326,14 +1326,18 @@ distcheck: dist
 ');
 
        $output_rules .= 'dist: distdir' . "\n\t";
-       $output_rules .= 'chmod -R a+r $(distdir)' . "\n\t";
+       # Ignore return result from chmod, because it might give an
+       # error if we chmod a symlink.
+       $output_rules .= '-chmod -R a+r $(distdir)' . "\n\t";
        $output_rules .= '$(TAR) chozf $(distdir).tar.gz $(distdir)';
        $output_rules .= "\n\t" . 'rm -rf $(distdir)' . "\n";
 
        if (defined $options{'dist-shar'})
        {
            $output_rules .= 'dist-shar: distdir' . "\n\t";
-           $output_rules .= 'chmod -R a+r $(distdir)' . "\n\t";
+           # Ignore return result from chmod, because it might give
+           # an error if we chmod a symlink.
+           $output_rules .= '-chmod -R a+r $(distdir)' . "\n\t";
            $output_rules .= 'shar $(distdir) | gzip > $(distdir).shar.gz';
            $output_rules .= "\n\t" . 'rm -rf $(distdir)' . "\n";
        }
@@ -1643,7 +1647,10 @@ sub handle_footer
 
     if (defined $contents{'SUFFIXES'})
     {
-       push (@suffixes, '$(SUFFIXES)');
+       # Push actual suffixes, and not $(SUFFIXES).  Some versions of
+       # make do not like variable substitutions on the .SUFFIXES
+       # line.
+       push (@suffixes, split (' ', $contents{'SUFFIXES'}));
     }
 
     $output_trailer .= ".SUFFIXES:\n";

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 85c037a649508b4572e5efbd443e001a802e4c81..42bcfac3b589aa5bb474dba2586b6a1ed5cab458 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -31,7 +31,6 @@ mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        for subdir in $(SUBDIRS); do            \
          target=`echo $@ | sed s/-recursive//`; \
-         echo making $$target in $$subdir;     \
          (cd $$subdir && $(MAKE) $$target)     \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.

diff --git a/subdirs.am b/subdirs.am
index 85c037a649508b4572e5efbd443e001a802e4c81..42bcfac3b589aa5bb474dba2586b6a1ed5cab458 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -31,7 +31,6 @@ mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
        for subdir in $(SUBDIRS); do            \
          target=`echo $@ | sed s/-recursive//`; \
-         echo making $$target in $$subdir;     \
          (cd $$subdir && $(MAKE) $$target)     \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.