From: Tom Tromey <tromey@redhat.com>
Date: Tue, 22 Oct 1996 05:03:56 +0000 (+0000)
Subject: Fix for brackets around version
X-Git-Tag: Release-1-1g~16
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=9045222bbb761b1ab0837c4c20a90d011af7139b;p=automake.git

Fix for brackets around version
---

diff --git a/automake.in b/automake.in
index f6089c94..3e367bec 100755
--- 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 6d61ecef..fd47e27d 100644
--- 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 8af6a8f8..1b513fe0 100644
--- 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 b98c2156..ea128db0 100644
--- 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
index 00000000..65546021
--- /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 6681806d..e8579259 100644
--- 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