Bug fixes

diff --git a/ChangeLog b/ChangeLog
index 9a10b01f344963d6145abe5064bf1fdc7abd60d5..0eed79a31f4222dfa0c74159bce091915abd5b9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 Sun Sep  8 09:00:37 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (check_gnits_standards): Only check version number
+       syntax at top level.
+       ($package_version_line): New variable.
+       (scan_configure): Set it.
+       (check_gnits_standards): Use am_conf_line_error.
+       (scan_configure): Remove extraneous whitespace from version
+       number.
+
        * m4/AM_PROG_CC_STDC.m4: Applied patch from Jim Meyering.
 
        * automake.in (scan_configure): Handle AM_WITH_REGEX.

diff --git a/Makefile.in b/Makefile.in
index 62a9a3c2638e42da00f2d30000282f0d1c56c3d7..f8c25571e667e4f3f31a38618aab318a0d25fa42 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,11 +158,8 @@ stamp-vti: automake.texi $(top_srcdir)/configure.in
          && $(SHELL) ./mdate-sh automake.texi`" > vti.tmp
        echo "@set EDITION $(VERSION)" >> vti.tmp
        echo "@set VERSION $(VERSION)" >> vti.tmp
-       if cmp -s vti.tmp $(srcdir)/version.texi; then \
-         rm vti.tmp;                   \
-       else                                    \
-         mv vti.tmp $(srcdir)/version.texi; \
-       fi
+       cmp -s vti.tmp $(srcdir)/version.texi || cp vti.tmp $(srcdir)/version.texi
+       rm vti.tmp
        echo timestamp > $(srcdir)/stamp-vti
 
 mostlyclean-vti:
@@ -281,9 +278,9 @@ mostlyclean-tags:
 clean-tags:
 
 distclean-tags:
+       rm -f TAGS ID
 
 maintainer-clean-tags:
-       rm -f TAGS ID
 
 distdir = $(PACKAGE)-$(VERSION)
 # This target untars the dist file and tries a VPATH configuration.  Then

diff --git a/automake.in b/automake.in
index a594d7f50d3a8cd4e33ae0bab1241bb834a2cea3..35f361faa30c4243f40d1dc8d97ec2f59d05febe 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -182,6 +182,9 @@ $seen_version = 0;
 # Actual version we've seen.
 $package_version = '';
 
+# Line number where we saw version definition.
+$package_version_line = 0;
+
 # TRUE if we've seen AM_PATH_LISPDIR.
 $seen_lispdir = 0;
 
@@ -2757,7 +2760,8 @@ sub scan_configure
            $seen_version = 1;
            $seen_arg_prog = 1;
            $seen_prog_install = 2;
-           $package_version = $1;
+           ($package_version = $1) =~ s/\s//;
+           $package_version_line = $.;
        }
 
        # Some things required by Automake.
@@ -2775,6 +2779,7 @@ sub scan_configure
        {
            $seen_version = 1;
            $package_version = $1;
+           $package_version_line = $.;
        }
         elsif (/VERSION=/)
        {
@@ -2853,15 +2858,19 @@ sub check_gnits_standards
            &am_error ("\`${relative_dir}/COPYING.LIB' disallowed by Gnits standards");
        }
 
-       if ($package_version !~ /^$GNITS_VERSION_PATTERN$/)
-       {
-           &am_error ("version \`$package_version' doesn't follow Gnits standards");
-       }
-       elsif (defined $1 && -f 'README-alpha' && $relative_dir eq '.')
+       if ($relative_dir eq '.')
        {
-           # This means we have an alpha release.  See
-           # GNITS_VERSION_PATTERN for details.
-           &require_file ($GNITS, 'README-alpha');
+           if ($package_version !~ /^$GNITS_VERSION_PATTERN$/)
+           {
+               &am_conf_line_error ($package_version_line,
+                                    "version \`$package_version' doesn't follow Gnits standards");
+           }
+           elsif (defined $1 && -f 'README-alpha')
+           {
+               # This means we have an alpha release.  See
+               # GNITS_VERSION_PATTERN for details.
+               &require_file ($GNITS, 'README-alpha');
+           }
        }
     }