Fix for brackets around version

diff --git a/automake.in b/automake.in
index f6089c94312cd8c9f49ea09a6d51390da1c1b7eb..3e367becb1035433d960496129b8d575f6041d20 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2929,7 +2929,7 @@ sub scan_configure
            $seen_version = 1;
            $seen_arg_prog = 1;
            $seen_prog_install = 2;
-           ($package_version = $1) =~ s/\s//;
+           ($package_version = $1) =~ s/^\s*\[?([^]\s]+)\]?\s*$/$1/;
            $package_version_line = $.;
        }
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 6d61ecefa7b36a6159e10fff31529572a2fd036c..fd47e27dbe747d6e147a2c6fbebab97dfe9f11c1 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 21 22:57:51 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * version.test: New file.
+
 Fri Oct 11 00:51:04 1996  Tom Tromey  <tromey@cygnus.com>
 
        * libobj5.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8af6a8f86082dc4beecb5bf96830ece82e9151a1..1b513fe0b237236789b83a8c203357f84feb49f6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,6 +17,6 @@ order.test libobj2.test interp.test alllib.test block.test libobj3.test \
 gnits.test interp2.test colneq.test implicit.test spell.test spell2.test \
 confsub.test primary.test primary2.test depend2.test spell3.test \
 comment2.test vpath.test symlink.test discover.test acinclude.test req.test \
-acsilent.test distdir.test lex2.test libobj4.test libobj5.test
+acsilent.test distdir.test lex2.test libobj4.test libobj5.test version.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b98c2156fc0a82eb0b3e0982bc0a16e6f891c1ae..ea128db0d6da0505a445a562f2dab88558c2fedb 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -55,10 +55,10 @@ order.test libobj2.test interp.test alllib.test block.test libobj3.test \
 gnits.test interp2.test colneq.test implicit.test spell.test spell2.test \
 confsub.test primary.test primary2.test depend2.test spell3.test \
 comment2.test vpath.test symlink.test discover.test acinclude.test req.test \
-acsilent.test distdir.test lex2.test libobj4.test libobj5.test
+acsilent.test distdir.test lex2.test libobj4.test libobj5.test version.test
 
 EXTRA_DIST = defs $(TESTS)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 

diff --git a/tests/version.test b/tests/version.test
new file mode 100755 (executable)
index 0000000..6554602
--- /dev/null
+++ b/tests/version.test
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# Test to make sure [...] is ok in version number.  Report from Jim
+# Meyering.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AM_INIT_AUTOMAKE([sh-utils], [1.12o])
+AC_OUTPUT(Makefile)
+END
+
+: > Makefile.am
+
+# Files required by Gnits.
+: > INSTALL
+: > NEWS
+: > README
+: > COPYING
+: > AUTHORS
+: > ChangeLog
+: > THANKS
+
+$AUTOMAKE --gnits

diff --git a/version.texi b/version.texi
index 6681806d3f0eecac6d0e4d4125513aab9cdd3703..e85792592f8d6a850a65d3ef19ca490ceb9d1faa 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 5 October 1996
+@set UPDATED 20 October 1996
 @set EDITION 1.1g
 @set VERSION 1.1g