Bug fixes

diff --git a/AUTHORS b/AUTHORS
new file mode 100644 (file)
index 0000000..49de6bb
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,7 @@
+Authors of GNU Automake.
+
+David Mackenzie.  First version of most ".am" files.
+Wrote sh version of automake.in.
+
+Tom Tromey.  Touched all ".am" files.
+Rewrote automake.in

diff --git a/ChangeLog b/ChangeLog
index 3196eef..eeed9cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@ Sat Jan  6 10:58:23 1996  Tom Tromey  <tromey@cambric.colorado.edu>
        (handle_texinfo): Ditto.
        (handle_merge_targets): Let 'install' depend on 'all' if no other
        dependencies exist.  From Jim Meyering.
+       (check_gnu_standards): GNU requires AUTHORS file.  (See
+       maintain.text).
+       (require_file): Put body in loop.
+       (get_object_extension): Only call require_file once.
+       (handle_configure): Ditto.
 
        From Jim Meyering:
        * depend.am ($(srcdir)/.deps/.P): Depend on $(BUILT_SOURCES).

diff --git a/Makefile.in b/Makefile.in
index a340160..56dff1c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -211,7 +211,7 @@ dist: $(DISTFILES)
        mkdir $(distdir)
        distdir=`cd $(distdir) && pwd` \
          && cd $(srcdir) \
-         && automake --include-deps --output-dir=$$distdir --strictness=normal
+         && automake --include-deps --output-dir=$$distdir --strictness=gnits
        @for file in $(DISTFILES); do           \
          test -f $(distdir)/$$file \
          || ln $(srcdir)/$$file $(distdir)/$$file \

diff --git a/automake.in b/automake.in
index ceec061..8dd9b6f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -296,8 +296,7 @@ sub get_object_extension
            $dir_holds_sources = '.$(kr)o';
            push (@suffixes, '._c', '._o');
 
-           &require_file ($NORMAL, 'ansi2knr.c');
-           &require_file ($NORMAL, 'ansi2knr.1');
+           &require_file ($NORMAL, 'ansi2knr.c', 'ansi2knr.1');
 
            $output_vars .= &file_contents ('kr-vars');
            $output_rules .= &file_contents ('compile-kr');
@@ -862,8 +861,7 @@ sub handle_configure
        $output_rules .= &file_contents ('remake');
 
        # Look for some files we need.
-       &require_file ($NORMAL, 'install-sh');
-       &require_file ($NORMAL, 'mkinstalldirs');
+       &require_file ($NORMAL, 'install-sh', 'mkinstalldirs');
     }
 
     if (defined $contents{'CONFIG_HEADER'}
@@ -1159,7 +1157,8 @@ sub check_gnu_standards
     if ($relative_dir eq '.')
     {
        # In top level (or only) directory.
-       &require_file ($GNU, 'INSTALL', 'NEWS', 'README', 'COPYING');
+       &require_file ($GNU, 'INSTALL', 'NEWS', 'README', 'COPYING',
+                      'AUTHORS');
     }
 }
 
@@ -1720,30 +1719,35 @@ sub am_install_var
 # required.
 sub require_file
 {
-    local ($mystrict, $file) = @_;
-    local ($fullfile) = $relative_dir . "/" . $file;
+    local ($mystrict, @files) = @_;
+    local ($file, $fullfile);
 
-    if (-f $fullfile)
-    {
-       &push_dist_common ($file);
-    }
-    elsif ($install_missing && -f ($am_dir . '/' . $file))
+    foreach $file (@files)
     {
-       # Install the missing file.  Symlink if we can, copy if we must.
-       if ($symlink_exists)
+       $fullfile = $relative_dir . "/" . $file;
+
+       if (-f $fullfile)
        {
-           symlink ($am_dir . '/' . $file, $fullfile);
+           &push_dist_common ($file);
        }
-       else
+       elsif ($install_missing && -f ($am_dir . '/' . $file))
+       {
+           # Install the missing file.  Symlink if we can, copy if we must.
+           if ($symlink_exists)
+           {
+               symlink ($am_dir . '/' . $file, $fullfile);
+           }
+           else
+           {
+               system ('cp', $am_dir . '/' . $file, $fullfile);
+           }
+           &am_error ("required file \"$fullfile\" not found; installing");
+       }
+       elsif ($strictness >= $mystrict)
        {
-           system ('cp', $am_dir . '/' . $file, $fullfile);
+           # Only an error if strictness constraint violated.
+           &am_error ("required file \"$fullfile\" not found");
        }
-       &am_error ("required file \"$fullfile\" not found; installing");
-    }
-    elsif ($strictness >= $mystrict)
-    {
-       # Only an error if strictness constraint violated.
-       &am_error ("required file \"$fullfile\" not found");
     }
 }