* automake.in (handle_texinfo): Add texinfo.tex to config_aux_dir

when appropriate.
Reported by Per Cederqvist <ceder@lysator.liu.se>
(handle_texinfo): Do not define texinfo_tex='.', use
'$(srcdir)/texinfo.tex' instead; the directory name will be
properly extracted.
(require_conf_file_with_line): Fixed typo.

diff --git a/ChangeLog b/ChangeLog
index 13d9be6dae9d48630124d20ca5cfd4459236c30a..bff1220dba8e417d9223b4fe09a204d401c44b80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-04-07  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * automake.in (handle_texinfo): Add texinfo.tex to config_aux_dir
+       when appropriate.
+       Reported by Per Cederqvist <ceder@lysator.liu.se>
+       (handle_texinfo): Do not define texinfo_tex='.', use
+       '$(srcdir)/texinfo.tex' instead; the directory name will be
+       properly extracted.
+       (require_conf_file_with_line): Fixed typo.
+
 1999-04-03  Raja R Harinath  <harinath@cs.umn.edu>
 
        * automake.in (handle_tests): Test `dir=./' before `dir=', so that 

diff --git a/automake.in b/automake.in
index d392491d9425635aee17cba1b4ae7d4726f8f782..80d967d45501a3f03ff3f7058a4500eabb04e451 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2033,6 +2033,7 @@ sub handle_texinfo
     {
        $texinfo_tex = $config_aux_dir . '/texinfo.tex';
        &define_variable ('TEXINFO_TEX', $texinfo_tex);
+       $need_texi_file = 2; # so that we require_conf_file later
     }
     elsif (&variable_defined ('TEXINFO_TEX'))
     {
@@ -2043,7 +2044,7 @@ sub handle_texinfo
     }
     else
     {
-       $texinfo_tex = '.';
+       $texinfo_tex = '$(srcdir)/texinfo.tex';
        $need_texi_file = 1;
     }
     local ($xxform);
@@ -2103,8 +2104,13 @@ sub handle_texinfo
     # Do some error checking.  Note that this file is not required
     # when in Cygnus mode; instead we defined TEXINFO_TEX explicitly
     # up above.
-    &require_file_with_line ('info_TEXINFOS', $FOREIGN, 'texinfo.tex')
-       if $need_texi_file && ! defined $options{'no-texinfo.tex'};
+    if ($need_texi_file && ! defined $options{'no-texinfo.tex'}) {
+      if ($need_texi_file > 1) {
+       &require_conf_file_with_line ('info_TEXINFOS', $FOREIGN, 'texinfo.tex');
+      } else {
+       &require_file_with_line ('info_TEXINFOS', $FOREIGN, 'texinfo.tex');
+      }
+    }
 }
 
 # Handle any man pages.
@@ -7132,7 +7138,7 @@ sub require_conf_file_with_line
     }
 }
 
-# Assumes that the line number is in Makefile.am.
+# Assumes that the line number is in configure.in.
 sub require_conf_file_with_conf_line
 {
     @require_file_paths = @config_aux_path;