From d6e40f77711054d86f36971629148e98cc408653 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 11 Sep 1996 18:32:31 +0000 Subject: [PATCH] Last-minute bug fixes; moved to 1.1e --- ChangeLog | 9 ++++++++- Makefile.in | 4 ++-- NEWS | 2 +- TODO | 6 ++++++ automake.in | 6 ++++-- configure | 2 +- configure.in | 2 +- m4/Makefile.in | 2 +- tests/Makefile.in | 2 +- version.texi | 4 ++-- 10 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6915ea43..eb1f33c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ Wed Sep 11 11:54:44 1996 Tom Tromey - * 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 diff --git a/Makefile.in b/Makefile.in index 8c840c64..089b4b6e 100644 --- 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 325f1769..24928a35 100644 --- 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 7687c38b..fb88b3ab 100644 --- 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 20d6c4e4..39350c28 100755 --- 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 33ac5d0b..1371f94e 100755 --- a/configure +++ b/configure @@ -601,7 +601,7 @@ cat >> confdefs.h <> confdefs.h <