From d95cc9e02b8b571cd271f9c92aaf8edf17f7860a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 12 Feb 1996 17:45:38 +0000 Subject: [PATCH] Bug fix, plus test --- ChangeLog | 6 ++++++ THANKS | 2 ++ automake.in | 11 ++--------- tests/ChangeLog | 6 ++++++ tests/Makefile.am | 5 ++++- tests/Makefile.in | 7 +++++-- tests/acoutnoq.test | 19 +++++++++++++++++++ 7 files changed, 44 insertions(+), 12 deletions(-) create mode 100755 tests/acoutnoq.test diff --git a/ChangeLog b/ChangeLog index 5df9dd4e..54eb0966 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 12 10:39:28 1996 Tom Tromey + + * automake.in (scan_configure): Delete everything after "," or + ")". Test acoutnoq.test. + (handle_dist): Use $relative_dir, not nonexistent $subdir. + Sun Feb 11 15:55:15 1996 Tom Tromey * automake.in (handle_texinfo): Removed bogus error message. diff --git a/THANKS b/THANKS index 8c832e3c..51750ffc 100644 --- a/THANKS +++ b/THANKS @@ -5,6 +5,8 @@ people: François Pinard Gord Matzigkeit Greg A. Woods +Jerome Santini Jim Meyering Karl Berry +Noah Friedman Ulrich Drepper diff --git a/automake.in b/automake.in index c32ac228..ee8ddb22 100755 --- a/automake.in +++ b/automake.in @@ -642,13 +642,6 @@ sub grep_for_vers_texi return ''; } -# Do work of building, etc, Texinfo. Works for either info or html, -# depending on first argument. -sub texinfo_worker -{ - local ($dest) = @_; -} - # Handle all Texinfo source. sub handle_texinfo { @@ -998,7 +991,7 @@ sub handle_dist { &am_error ("DIST_CHARSET defined but no MAINT_CHARSET defined") if ! $local_maint_charset; - if ($subdir eq '.') + if ($relative_dir eq '.') { $dist_charset = $contents{'DIST_CHARSET'} } @@ -1579,7 +1572,7 @@ sub scan_configure if ($in_ac_output) { s/\].*$//; - $in_ac_output = 0 if s/[\),]//; + $in_ac_output = 0 if s/[\),].*$//; # Look at potential Makefile.am's. foreach (split) diff --git a/tests/ChangeLog b/tests/ChangeLog index e6d5028c..02308a02 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 12 10:05:48 1996 Tom Tromey + + * Makefile.am (DIST_OTHER): New variable. + + * acoutnoq.test: New file. + Sun Feb 11 16:39:14 1996 Tom Tromey * checkall.test: Delay a little. diff --git a/tests/Makefile.am b/tests/Makefile.am index e49f5290..a5ee9517 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,10 @@ AUTOMAKE_OPTIONS = gnits ## FIXME Ulrich has suggested implementing this in Automake. ## Perhaps he is right. -TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test +TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \ +acoutnoq.test + +DIST_OTHER = $(TESTS) check-local: @failed=0; all=0; \ diff --git a/tests/Makefile.in b/tests/Makefile.in index a4b76e0a..78c38cde 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 0.3 from Makefile.am +# Makefile.in generated automatically by automake 0.30 from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -40,7 +40,10 @@ transform = @program_transform_name@ AUTOMAKE_OPTIONS = gnits -TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test +TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \ +acoutnoq.test + +DIST_OTHER = $(TESTS) DIST_COMMON = ChangeLog Makefile.am Makefile.in diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test new file mode 100755 index 00000000..e9af2ea6 --- /dev/null +++ b/tests/acoutnoq.test @@ -0,0 +1,19 @@ +#!/bin/sh + +# Test for bug reported by Jerome Santini. +# If I put this line in my configure.in: +# AC_OUTPUT(Makefile src/Makefile tests/Makefile, echo timestamp > stamp-h)dnl +# automake is not happy: +# [ ... ] + +. $srcdir/defs + +cat > configure.in << 'END' +AC_ARG_PROGRAM +AC_PROG_INSTALL +AC_OUTPUT(Makefile, [true]) +END + +: > Makefile.am + +$AUTOMAKE -- 2.43.5