* automake.in (handle_texinfo): Only remove suffixes we can

	handle.

diff --git a/ChangeLog b/ChangeLog
index 9355d45420f7c0a6b7abd774323b7050424138b4..e3b84fd72a10658bfb1b0651c23eef6c29b7ae11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-21  Tom Tromey  <tromey@redhat.com>
 
+       * automake.in (handle_texinfo): Only remove suffixes we can
+       handle.
+
        * tests/distdir.test: Check to make sure directory isn't made in
        build directory.
 

diff --git a/automake.in b/automake.in
index 6ed2f74ba2799e26b8a915af592d16c17c79daa8..5cf880efeb1748fdb443369528d459179920cf75 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2303,9 +2303,7 @@ sub handle_texinfo
 
     foreach $info_cursor (@texis)
     {
-       # FIXME: This is mildly hacky, since it recognizes "txinfo".
-       # I don't feel like making it right.
-       ($infobase = $info_cursor) =~ s/\.te?xi(nfo)?$//;
+       ($infobase = $info_cursor) =~ s/\.(txi|texinfo|texi)$//;
 
        # If 'version.texi' is referenced by input file, then include
        # automatic versioning capability.