More error checking

diff --git a/ChangeLog b/ChangeLog
index eccbf2ca8a0c6b773be457b565716d6c08d19b22..ac3476322c1ba13d805424a36c2779e3fb61b57d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep  4 11:36:06 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (handle_merge_targets): Error if invalid uninstall
+       targets are given.
+
 Tue Sep  3 18:50:32 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * texinfos.am (install-info): Added NORMAL_INSTALL.

diff --git a/automake.in b/automake.in
index ad2afe8812fe096d71d267352f2962a7ef7cf3c6..78426fe7716c0aab7b8bcbddd68ce7375c974886 100755 (executable)
--- 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 bdaf166394cb1922d785bf342f92c5ea06b8f88a..6b8945899bb1441107bc7661f391ba8377cc5476 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep  3 20:57:38 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * block.test: New file.
+
 Mon Aug 26 23:04:01 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * alllib.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5530c284f85c8a13c45ca0c7aaf32b155a42e23c..89201fa91019244ee4e03507d97e61b7059b8c68 100644 (file)
--- 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 5d8349076b2d8fe9971d1721572129a8810bd890..58980aab61d4e90c0269a5c39ca03ad867f42ee5 100644 (file)
--- 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 (executable)
index 0000000..2ea3918
--- /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