automake-1.4-p1 and texinfo

[karl]

Hi folks,

Most of the same changes were needed to make automake-1.4-p1 work with
Texinfo as with 1.4.  In short, version.texi might be included in
multiple places and that's ok, seems to me; and don't necessarily grab
texinfo.tex from automake.

Thanks,
karl


*** automake~   Mon May 21 11:01:08 2001
--- automake    Mon May 21 11:04:53 2001
***************
*** 1927,1939 ****
        if ($vtexi)
        {
            &am_error ("\`$vtexi', included in \`$info_cursor', also included 
in \`$versions{$vtexi}'")
!               if (defined $versions{$vtexi});
            $versions{$vtexi} = $info_cursor;
  
            # We number the stamp-vti files.  This is doable since the
            # actual names don't matter much.  We only number starting
            # with the second one, so that the common case looks nice.
!           $vti = 'vti' . ($done ? $done : '');
            &push_dist_common ($vtexi, 'stamp-' . $vti);
            push (@clean, $vti);
  
--- 1927,1939 ----
        if ($vtexi)
        {
            &am_error ("\`$vtexi', included in \`$info_cursor', also included 
in \`$versions{$vtexi}'")
!               if (defined $versions{$vtexi} && $vtexi ne "version.texi");
            $versions{$vtexi} = $info_cursor;
  
            # We number the stamp-vti files.  This is doable since the
            # actual names don't matter much.  We only number starting
            # with the second one, so that the common case looks nice.
!           $vti = 'vti' . ($done ? ".$done" : '');
            &push_dist_common ($vtexi, 'stamp-' . $vti);
            push (@clean, $vti);
  
***************
*** 1960,1966 ****
                     . 's/address@hidden@/' . $vti . '/g; '
                     . 's/address@hidden@/' . $vtexi . '/g;'
                     . 's,address@hidden@,' . $conf_pat . ',g;',
!                    'texi-vers');
  
            &push_phony_cleaners ($vti);
        }
--- 1960,1967 ----
                     . 's/address@hidden@/' . $vti . '/g; '
                     . 's/address@hidden@/' . $vtexi . '/g;'
                     . 's,address@hidden@,' . $conf_pat . ',g;',
!                    'texi-vers')
!             unless $done > 1;
  
            &push_phony_cleaners ($vti);
        }
***************
*** 6209,6215 ****
         "INSTALL", "ABOUT-NLS", "ChangeLog", "configure", "configure.in",
         "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU",
         "libversion.in", "mdate-sh", "mkinstalldirs", "install-sh",
!        'texinfo.tex', "ansi2knr.c", "ansi2knr.1", 'elisp-comp',
         'ylwrap', 'acinclude.m4', @libtoolize_files, @libtoolize_sometimes,
         'missing'
         );
--- 6210,6216 ----
         "INSTALL", "ABOUT-NLS", "ChangeLog", "configure", "configure.in",
         "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU",
         "libversion.in", "mdate-sh", "mkinstalldirs", "install-sh",
!        "ansi2knr.c", "ansi2knr.1", 'elisp-comp',
         'ylwrap', 'acinclude.m4', @libtoolize_files, @libtoolize_sometimes,
         'missing'
         );