1999-02-04 Akim Demaille <demaille@inf.enst.fr>

	* automake.in (handle_texinfo): remove texinfo.tex from
 	TEXINFODIR.

diff --git a/ChangeLog b/ChangeLog
index 3bd316e3d26bfe39bb2d571eecb18d78535e11ab..86325a790e5bfb332ab497a33deb0c9d9fe8cf24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-02-04  Akim Demaille  <demaille@inf.enst.fr>
+
+       * automake.in (handle_texinfo): remove texinfo.tex from
+       TEXINFODIR.
+
 1999-02-02  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_merge_targets): Use INSTALL_STRIP_FLAG.

diff --git a/automake.in b/automake.in
index 5c04e83d050c86df5b8917b9aab4f975f3cc1119..6be106220b4549e7470055e1807e773a226216b8 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2037,7 +2037,8 @@ sub handle_texinfo
        $need_texi_file = 1;
     }
     local ($xxform);
-    ($xxform = $texinfo_tex) =~ s/(\W)/\\$1/g;
+    ($xxform = $texinfo_tex) =~ s/\/texinfo\.tex$//;
+    $xxform =~ s/(\W)/\\$1/g;
     $xform .= ' s/\@TEXINFODIR\@/' . $xxform . '/g;';
 
     $output_rules .= &file_contents_with_transform ($xform, 'texinfos');