Bug and doc fixes

diff --git a/ChangeLog b/ChangeLog
index d995ee268b23c5acd1d3c3ffbe1c73c52c2f639b..ce93edf3226059bff5e57bc90606183e377820f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug  4 12:52:43 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (handle_configure): Require file $input, not
+       "$local.in".  From Nyul Laszlo.  Test colon.test.
+
 Sun Jul 28 11:14:52 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * aclocal.in: New file.

diff --git a/THANKS b/THANKS
index 58929573c9068542b8b55fc12341971f4f872809..ddd5c024bc8533af49d996d4eeee8798cdd9357c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -8,7 +8,9 @@ Fran
 Gord Matzigkeit <gord@enci.ucalgary.ca>
 Greg A. Woods <woods@most.weird.com>
 Harlan Stenn <Harlan.Stenn@pfcs.com>
+Harlan Stenn <Harlan.Stenn@pfcs.com>
 Henrik Frystyk Nielsen <frystyk@w3.org>
+Jason Molenda <crash@cygnus.co.jp>
 Jerome Santini <santini@chambord.univ-orleans.fr>
 Jim Meyering <meyering@na-net.ornl.gov>
 Joerg-Martin Schwarz <jms@jms.prima.ruhr.de>
@@ -17,5 +19,6 @@ Karl Berry <kb@cs.umb.edu>
 Mark Galassi <rosalia@nis.lanl.gov>
 Markku Rossi <mtr@ngs.fi>
 Noah Friedman <friedman@gnu.ai.mit.edu>
+Nyul Laszlo <nyul@sol.cc.u-szeged.hu>
 Thomas Morgan <tmorgan@pobox.com>
 Ulrich Drepper <drepper@gnu.ai.mit.edu>

diff --git a/TODO b/TODO
index b4d462d8a07a1c9e8f7739d75b4ff021bc39ffee..d489f8828640502fc077182d690c34533c150b99 100644 (file)
--- a/TODO
+++ b/TODO
@@ -247,6 +247,14 @@ These can both be handled via dist-hook:
 
 consider having no-gzip option that turns off gzip/GNU tar.
 
+djm says:
+David> To avoid comments like the one about subdirs getting buried in
+David> the middle of a Makefile.in, how about pushing comments that
+David> start with ### to the top of the Makefile.in (in order)?  Sort
+David> of like how Autoconf uses diversions to force initialization
+David> code to the top of configure.
+
+
 ================================================================
 
 Stuff for aclocal:
@@ -332,6 +340,11 @@ document actual uses of PACKAGE and VERSION
 
 Must document aclocal program
 
+djm says:
+David> A list of autoconf macros that can be required for use with
+David> automake, all in one place, would be helpful.
+
+
 ================================================================
 
 Libraries:

diff --git a/automake.in b/automake.in
index 6fa7e8db08e30f36a6bb3c7dcb9db300771db280..75e8abcb5af773711f435ea32b041aa056e459a4 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1569,7 +1569,7 @@ sub handle_configure
                          . "\n");
 
        &require_file_with_conf_line ($ac_output_line, $FOREIGN,
-                                     $local . '.in');
+                                     $input);
     }
 }
 

diff --git a/automake.texi b/automake.texi
index 8997060d719eb467a4ae52ed9806526e97a9c0ed..bcdcf364f764744cc1e56186723bd790b3468f34 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -63,8 +63,8 @@ This is the first edition of the GNU Automake documentation,@*
 and is consistent with GNU Automake @value{VERSION}.@*
 @sp 2
 Published by the Free Software Foundation @*
-675 Massachusetts Avenue, @*
-Cambridge, MA 02139 USA @*
+59 Template Place - Suite 330, @*
+Boston, MA 02111-1307 USA @*
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -256,8 +256,8 @@ GNU @code{make}, which does not currently use @code{automake}).
 
 @section Strictness
 While Automake is intended to be used by maintainers of GNU packages, it
-does make some effort to accomodate those who wish to use it, but do not
-want to use all the GNU conventions.
+does make some effort to accommodate those who wish to use it, but do
+not want to use all the GNU conventions.
 
 To this end, Automake supports three levels of @dfn{strictness} -- the
 strictness indicating how stringently Automake should check standards
@@ -411,11 +411,11 @@ variables @code{PACKAGE} and @code{VERSION} with @code{AC_SUBST}.
 @cvindex PACKAGE
 @cvindex VERSION
 @code{PACKAGE} should be the name of the package as it appears when
-bundled for distribution.  For instance, Automake definees
-@code{PACKAGE} to be @samp{automake}.  @code{VERSION} should be the
-version number of the release that is being developed.  We recommend
-that you make @file{configure.in} the only place in your package where
-the version number is defined; this makes releases simpler.
+bundled for distribution.  For instance, Automake defines @code{PACKAGE}
+to be @samp{automake}.  @code{VERSION} should be the version number of
+the release that is being developed.  We recommend that you make
+@file{configure.in} the only place in your package where the version
+number is defined; this makes releases simpler.
 
 Automake requires the use of the macro @code{AC_ARG_PROGRAM} if a
 program or script is installed.
@@ -536,10 +536,10 @@ This macro adds a @samp{--enable-maintainer-mode} option to
 @cvindex jm_MAINTAINER_MODE
 @end table
 
-The @samp{fp_} macros are from @value{Francois} Pinard and the
-@samp{jm_} macro is from Jim Meyering.  Both sets are included with
-Automake.  @code{automake} will tell where the macros can be found if
-they are missing.
+The @samp{fp_} macros are from @value{Francois} Pinard, the @samp{jm_}
+macro is from Jim Meyering, and the @samp{ud_} macro is from Ulrich
+Drepper..  Both sets are included with Automake.  @code{automake} will
+tell where the macros can be found if they are missing.
 
 
 @node Top level
@@ -615,8 +615,8 @@ This causes @file{hello.c} to be compiled into @file{hello.o}, and then
 linked to produce @file{hello}.
 
 If @samp{prog_SOURCES} is needed, but not specified, then it defaults to
-the single file @file{prog.c}.  Id est in the example above, the
-definition of @code{hello_SOURCES} is actually redundant.
+the single file @file{prog.c}.  In the example above, the definition of
+@code{hello_SOURCES} is actually redundant.
 @vindex _SOURCES
 @vindex SOURCES
 
@@ -630,7 +630,7 @@ for these should work but is still preliminary.
 @c lex & yacc should have a separate section
 
 Sometimes it is useful to determine the programs that are to be built at
-configure time.  For instance, GNU @code{cpio} only builts @code{mt} and
+configure time.  For instance, GNU @code{cpio} only builds @code{mt} and
 @code{rmt} under special circumstances.
 
 In this case, you must notify @code{Automake} of all the programs that
@@ -838,6 +838,8 @@ variable will be the most used.
 All header files must be listed somewhere; missing ones will not appear
 in the distribution.  Often it is most convenient to list uninstalled
 headers with the rest of the sources for a program.  @xref{A Program}.
+Headers listed in a @samp{_SOURCES} variable need not be listed in any
+@samp{_HEADERS} variable.
 
 Headers can be installed in @code{includedir}, @code{oldincludedir}, or
 @code{pkgincludedir}.
@@ -856,7 +858,7 @@ Such data can be installed in the directories @code{datadir},
 
 All such data files are included in the distribution.
 
-Here is how @code{autoconf} installs its auxiliary data files:
+Here is how @code{automake} installs its auxiliary data files:
 
 @example
 pkgdata_DATA = clean-kr.am clean.am compile-kr.am compile-vars.am \

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 9ce69e24cf5fa37a28437c594d68d1894b1268c6..2f5d0ccf62b7bdaced7b4fb116d09e3436a1a04a 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Sun Aug  4 12:47:34 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * colon.test: New file.
+
 Sun Jul 28 11:43:00 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * defs (ACLOCAL): Added definition.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d2266448c0874a57766a2e44f1b99ae6e1f0a76a..c4be11bb146a304cc3dd4c4d9b2cfa5df4d9f64f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,6 @@ target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
 canon3.test mdate2.test subdir.test backsl.test package.test number.test \
 insh2.test outdir.test fpinstall.test fpinst2.test texinfo.test dejagnu.test \
 yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
-error.test
+error.test colon.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b931aebe8541efcaa9c673714a9296d7459063d7..d487d96da449b9bef3ad7b63d50b140904e7540b 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -48,7 +48,7 @@ target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
 canon3.test mdate2.test subdir.test backsl.test package.test number.test \
 insh2.test outdir.test fpinstall.test fpinst2.test texinfo.test dejagnu.test \
 yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \
-error.test
+error.test colon.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/colon.test b/tests/colon.test
new file mode 100755 (executable)
index 0000000..672bb54
--- /dev/null
+++ b/tests/colon.test
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# Test for bug reported by Nyul Laszlo.  When using the ":" syntax in
+# AC_OUTPUT, Automake fails to find the correct file.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_OUTPUT(Makefile foo.h:foo.hin)
+END
+
+: > Makefile.am
+: > foo.hin
+: > stamp-h.in
+
+$AUTOMAKE

diff --git a/version.texi b/version.texi
index edcd6cb059a57b4db86e173200efd534f2e74de6..361d7db48551b50f3a0be03c46a74e111712194b 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 10 June 1996
+@set UPDATED 4 August 1996
 @set EDITION 1.1a
 @set VERSION 1.1a