Last-minute bug fixes; moved to 1.1e

diff --git a/ChangeLog b/ChangeLog
index 6915ea43252500b5ee9c4660b41e3c05511dd013..eb1f33c1ac65048a4fc17983964e43c66f2bec15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 Wed Sep 11 11:54:44 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
-       * Released version 1.1d.
+       * Released version 1.1e.
+
+       * automake.in ($GNITS_VERSION_PATTERN): Handle non-alpha
+       releases.
+
+       * configure.in: Version 1.1e.
+
+       * automake.in (handle_texinfo): Distribute .info file.
 
 Sun Sep  8 09:00:37 1996  Tom Tromey  <tromey@creche.cygnus.com>
 

diff --git a/Makefile.in b/Makefile.in
index 8c840c6499ea0f8f56eb02429cfa4fc2d9b040a4..089b4b6e8ec000edd95eae8a836ab36892b73e3f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1d from Makefile.am
+# Makefile.in generated automatically by automake 1.1e from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -74,7 +74,7 @@ SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS)
 
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
-INFOS = automake.info[-0-9]*
+INFOS = automake.info automake.info[-0-9]*
 INFO_DEPS = automake.info
 DVIS = automake.dvi
 TEXINFOS = automake.texi

diff --git a/NEWS b/NEWS
index 325f1769b147e7e9df4cdb8242ea57dd8b07b9cc..24928a353e1df1b66769942e02b1493cef158e0c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.1d:
+New in 1.1e:
 * Bug fixes
 * Better DejaGNU support
 * Added no-installinfo option

diff --git a/TODO b/TODO
index 7687c38b86e7df44b9e237e55f4588c01b227cf1..fb88b3abcafd823f9d58953e247cb672465e6c48 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,12 @@
 Priorities for release:
   [ none ]
 
+must at least partially rewrite dist system (to handle distributing
+info files, which is currently somewhat broken).
+
+when checking version numbers in AUTOMAKE_OPTIONS, an alpha release
+should compare less than the full release; eg "1.0" < "1.0a" < "1.1".
+
 Per Bothner says:
 Per> 1) Being able to build a set of non-source programs
 Per> from source porgrams, without necessarily linking them together.

diff --git a/automake.in b/automake.in
index 20d6c4e4b709c275545147ebb5d667e3317dce60..39350c28fa351a9cea9db7efcdcdd0e4b49e2b33 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -41,7 +41,7 @@ $COMMENT_PATTERN = "^#";
 $RULE_PATTERN = "^([\$a-zA-Z_.][-.a-zA-Z0-9_(){}/]*) *:";
 $MACRO_PATTERN = "^([A-Za-z][A-Za-z0-9_]*)[ \t]*=[ \t]*(.*)\$";
 $BOGUS_MACRO_PATTERN = "^([^ \t]*)[ \t]*=[ \t]*(.*)\$";
-$GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)";
+$GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?";
 
 # Constants to define the "strictness" level.
 $FOREIGN = 0;
@@ -1261,7 +1261,9 @@ sub handle_texinfo
                          . join (' ', @texi_deps)
                          . "\n\n");
 
-       push (@infos_list, $infobase . '.info[-0-9]*');
+       # FIXME: this distributes too much.  How to find out precisely
+       # which files will be generated by `makeinfo'?
+       push (@infos_list, $infobase . '.info', $infobase . '.info[-0-9]*');
        push (@info_deps_list, $infobase . '.info');
        push (@dvis_list, $infobase . '.dvi');
 

diff --git a/configure b/configure
index 33ac5d0b7272417818122a12243b21fb6ec580b7..1371f94e97752e35747432d928927cbd37f4475e 100755 (executable)
--- a/configure
+++ b/configure
@@ -601,7 +601,7 @@ cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
 
-VERSION=1.1d
+VERSION=1.1e
 
 cat >> confdefs.h <<EOF
 #define VERSION "$VERSION"

diff --git a/configure.in b/configure.in
index 5758e65a1fb11f8b14f4c78f43d05c82200fba32..3b0cd1e1ab6e49c9bfe7c36c732a3b7968078c22 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(automake.in)
 
-AM_INIT_AUTOMAKE(automake, 1.1d)
+AM_INIT_AUTOMAKE(automake, 1.1e)
 
 AC_PROG_MAKE_SET
 AC_ARG_PROGRAM

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 80f558732a0f31236ad3ac95ce24f6a855392b8a..79e64950342e263873bb9fc5c0fcf81c6bce06c4 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1d from Makefile.am
+# Makefile.in generated automatically by automake 1.1e from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4e5ce1f0939c3c74e79ad211a9bb46e2e2031119..e6f2b38f4e740fe7d1844737826c3b668b6fc26a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1d from Makefile.am
+# Makefile.in generated automatically by automake 1.1e from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation

diff --git a/version.texi b/version.texi
index 3c0be126e3769aaabfc313c3fe0f1d857cb58093..3f53ec7125da2e67512462a840038dc5bb4926d6 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
 @set UPDATED 8 September 1996
-@set EDITION 1.1d
-@set VERSION 1.1d
+@set EDITION 1.1e
+@set VERSION 1.1e