From e3de48b3a72ebcd2301a1dc25a3265adf9303036 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 4 Sep 1996 23:14:25 +0000 Subject: [PATCH] More error checking --- ChangeLog | 5 +++++ automake.in | 11 +++++++++++ tests/ChangeLog | 4 ++++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- tests/block.test | 18 ++++++++++++++++++ 6 files changed, 40 insertions(+), 2 deletions(-) create mode 100755 tests/block.test diff --git a/ChangeLog b/ChangeLog index eccbf2ca..ac347632 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 4 11:36:06 1996 Tom Tromey + + * automake.in (handle_merge_targets): Error if invalid uninstall + targets are given. + Tue Sep 3 18:50:32 1996 Tom Tromey * texinfos.am (install-info): Added NORMAL_INSTALL. diff --git a/automake.in b/automake.in index ad2afe88..78426fe7 100755 --- a/automake.in +++ b/automake.in @@ -2061,6 +2061,17 @@ sub handle_merge_targets if defined $contents{'install-data-local'}; push (@uninstall, 'uninstall-local') if defined $contents{'uninstall-local'}; + local ($utarg); + foreach $utarg ('uninstall-data-local', 'uninstall-data-hook', + 'uninstall-exec-local', 'uninstall-exec-hook') + { + if (defined $contents{$utarg}) + { + local ($x); + ($x = $utarg) =~ s/(data|exec)-//; + &am_line_error ($utarg, "use \`$x', not \`$utarg'"); + } + } push (@all, 'all-local') if defined $contents{'all-local'}; diff --git a/tests/ChangeLog b/tests/ChangeLog index bdaf1663..6b894589 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Tue Sep 3 20:57:38 1996 Tom Tromey + + * block.test: New file. + Mon Aug 26 23:04:01 1996 Tom Tromey * alllib.test: New file. diff --git a/tests/Makefile.am b/tests/Makefile.am index 5530c284..89201fa9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,6 +13,6 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \ error.test colon.test vtexi2.test tags.test comment.test libfiles.test \ man.test info.test obsolete.test lex.test scripts.test subdir2.test \ exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \ -order.test libobj2.test interp.test alllib.test +order.test libobj2.test interp.test alllib.test block.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 5d834907..58980aab 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -51,7 +51,7 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \ error.test colon.test vtexi2.test tags.test comment.test libfiles.test \ man.test info.test obsolete.test lex.test scripts.test subdir2.test \ exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \ -order.test libobj2.test interp.test alllib.test +order.test libobj2.test interp.test alllib.test block.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(top_srcdir)/mkinstalldirs diff --git a/tests/block.test b/tests/block.test new file mode 100755 index 00000000..2ea39184 --- /dev/null +++ b/tests/block.test @@ -0,0 +1,18 @@ +#! /bin/sh + +# Make sure block comments are not double-spaced. + +. $srcdir/defs || exit 1 + +cat > Makefile.am << 'END' +#START +#a +#b +#c +#END +END + +$AUTOMAKE || exit 1 + +(sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && exit 1 +exit 0 -- 2.43.5