texinfo handling fix

diff --git a/ChangeLog b/ChangeLog
index d29e01f550ba105b5939b7e2d3dbd533725337fa..aa60c06a138028b700e4bb3cd4bfc88b4c599c78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 27 12:56:50 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_texinfo): Only require texinfo.tex in
+       appropriate situations.  Report from Paul D. Smith.
+
 Mon Aug 25 15:45:52 1997  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (scan_dependency_file): Fix so that

diff --git a/THANKS b/THANKS
index 6d5b5fee4a3828ace7d56dc4113cb0430c261f51..2e66e4d6a47688dfdd5e98ca442e9c34017c78ce 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ It would not be what it is today without the invaluable help of these
 people:
 
 "Markus F.X.J. Oberhumer" <k3040e4@wildsau.idv-edu.uni-linz.ac.at>
+"Paul D. Smith" <psmith@BayNetworks.COM>
 Akim Demaille <demaille@inf.enst.fr>
 Alexander V. Lukyanov <lav@yars.free.net>
 Alexandre Oliva <oliva@dcc.unicamp.br>

diff --git a/automake.in b/automake.in
index e894d19e8cb0e839d620965b6e7f42139f30d769..eed301b164a21e764c25bce177d9daa53796c757 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2028,6 +2028,7 @@ sub handle_texinfo
     }
 
     # Handle location of texinfo.tex.
+    local ($need_texi_file) = 0;
     if ($cygnus_mode)
     {
        &define_variable ('TEXINFO_TEX',
@@ -2040,6 +2041,7 @@ sub handle_texinfo
     elsif (! &variable_defined ('TEXINFO_TEX'))
     {
        &define_variable ('TEXINFO_TEX', '$(srcdir)/texinfo.tex');
+       $need_texi_file = 1;
     }
     local ($xxform) = &dirname (&variable_value ('TEXINFO_TEX'));
     $xxform =~ s/(\W)/\\$1/g;
@@ -2097,8 +2099,7 @@ sub handle_texinfo
     # when in Cygnus mode; instead we defined TEXINFO_TEX explicitly
     # up above.
     &require_file_with_line ('info_TEXINFOS', $FOREIGN, 'texinfo.tex')
-       unless (defined $options{'no-texinfo.tex'}
-               || &variable_defined ('TEXINFO_TEX'));
+       if $need_texi_file || ! defined $options{'no-texinfo.tex'};
 }
 
 # Handle any man pages.