Bug fix

diff --git a/ChangeLog b/ChangeLog
index cdc93428d7b97ccfa868600c743ab273aaadf1ce..d475fe21886429efbe38be17450ccd34e274460b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Sun Aug  4 12:52:43 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       Fix for bug reported by Harlan Stenn.  Test tags.test.
+       * automake.in (initialize_per_input): Define dir_holds_sources.
+       (handle_tags): Check dir_holds_headers.
+       (handle_headers): Set dir_holds_headers.
+
        * automake.in (handle_texinfo): Generate "version.texi" dependency
        for .dvi file.  Bug reported by Glenn Amerine.  Test vtexi2.test.
 

diff --git a/THANKS b/THANKS
index ddd5c024bc8533af49d996d4eeee8798cdd9357c..8908313d291c7af4190cc517df18d3543bf573b1 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -5,10 +5,10 @@ people:
 Andreas Schwab <schwab@lamothe.informatik.uni-dortmund.de>
 Dieter Baron <dillo@stieltjes.smc.univie.ac.at>
 François Pinard <pinard@iro.umontreal.ca>
+Glenn Amerine <glenn@pie.mhsc.org>
 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>

diff --git a/automake.in b/automake.in
index d9ae2ce80d19acf3892bdb2d19fbb564447881f3..843f351e1ca17bbfb2c08d8b8900876a7ee6705e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1119,7 +1119,9 @@ sub handle_tags
        push (@phony, 'tags-recursive');
        $tagging = 1;
     }
-    elsif ($dir_holds_sources || &variable_defined ('ETAGS_ARGS'))
+    elsif ($dir_holds_sources
+          || $dir_holds_headers
+          || &variable_defined ('ETAGS_ARGS'))
     {
        $output_rules .= &file_contents ('tags-subd');
        $tagging = 1;
@@ -1579,9 +1581,9 @@ sub handle_configure
 # Handle C headers.
 sub handle_headers
 {
-    &am_install_var ('header', 'HEADERS', 'include',
-                    'oldinclude', 'pkginclude',
-                    'noinst', 'check');
+    $dir_holds_headers = &am_install_var ('header', 'HEADERS', 'include',
+                                         'oldinclude', 'pkginclude',
+                                         'noinst', 'check');
 }
 
 sub handle_gettext
@@ -2699,6 +2701,9 @@ sub initialize_per_input
     # the function get_object_extension).
     $dir_holds_sources = '';
 
+    # TRUE if current directory holds any headers.
+    $dir_holds_headers = 0;
+
     # TRUE if install targets should work recursively.
     $recursive_install = 0;
 

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 53b6d82843d1dbd987a19fa68fa9c42d6158e7ca..f883fb9f3d899d06812ac0df3c1ac06fb43414ff 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Sun Aug  4 12:47:34 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * tags.test: New file.
+
        * vtexi2.test: New file.
 
        * colon.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 38cc4fd1a3a47b8e310a31ec011e65b7cc7f2686..436ff067b403f2958c16d6034f3c82a16cdbe428 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 colon.test vtexi2.test
+error.test colon.test vtexi2.test tags.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index f2b5270c92aef23ed95dbcc079d024e79dd9e824..4edc62892832db4e24cafe05908abc58c25fb492 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 colon.test vtexi2.test
+error.test colon.test vtexi2.test tags.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/tags.test b/tests/tags.test
new file mode 100755 (executable)
index 0000000..ca6a29f
--- /dev/null
+++ b/tests/tags.test
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+# Test for bug reported by Harlan Stenn: the tags target doesn't work
+# when there are only headers in a directory.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+noinst_HEADERS = iguana.h
+END
+
+: > iguana.h
+
+$AUTOMAKE || exit 1
+
+grep '^ID:' Makefile.in

diff --git a/tests/vtexi2.test b/tests/vtexi2.test
new file mode 100755 (executable)
index 0000000..f59e9f8
--- /dev/null
+++ b/tests/vtexi2.test
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# Test for bug reported by Glenn Amerine:
+#   When automake sees version.texi is being included by a texi file,
+#   version.texi gets listed as a dependency for the .info file but
+#   not the .dvi file.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = zardoz.texi
+END
+
+cat > zardoz.texi << 'END'
+@include version.texi
+END
+
+# Required when using Texinfo.
+: > mdate-sh
+: > texinfo.tex
+
+$AUTOMAKE || exit 1
+
+grep '^zardoz\.dvi:' Makefile.in