automake 1.6 & install-info & texinfo

[Karl Berry]

The new Cygnus-inspired install-info target in automake breaks texinfo,
since I have an actual install-info program.

I hacked around this by brute force (see diff below).  Any thoughts for
a real solution?  Here's what I can think of:
(1) an option [yuck]; or
(2) avoid creating the install-info target if it already exists by
    virtue of bin_PROGRAMS including install-info;
(3) there are no texinfo files to be installed in the source subdir
    where the install-info program is (namely util/), so it seems
    unnecessary to create all those info-related targets in the first place.

Help?

Thanks,
karl


*** /usr/local/gnu/bin/ORIG/automake    Fri Mar  8 11:31:51 2002
--- /usr/local/gnu/bin/automake Fri Mar  8 11:55:24 2002
***************
*** 442,448 ****
     'all'          => 1,
     'dvi'        => 1,
     'info'       => 1,
!    'install-info' => 1,
     'install'      => 1,
     'install-data' => 1,
     'install-exec' => 1,
--- 442,448 ----
     'all'          => 1,
     'dvi'        => 1,
     'info'       => 1,
! #   'install-info' => 1,
     'install'      => 1,
     'install-data' => 1,
     'install-exec' => 1,
***************
*** 719,726 ****
         'install-man'        => [],
         'uninstall-man'              => [],
  
!        'install-info'         => [],
!        'install-info-am'      => [],
         'uninstall-info'       => [],
  
         'installcheck-am'      => [],
--- 719,726 ----
         'install-man'        => [],
         'uninstall-man'              => [],
  
! #       'install-info'         => [],
! #       'install-info-am'      => [],
         'uninstall-info'       => [],
  
         'installcheck-am'      => [],
*** /usr/local/gnu/share/automake-1.6/am/ORIG/texinfos.am       Fri Mar  8 
12:07:17 2002
--- /usr/local/gnu/share/automake-1.6/am/texinfos.am    Fri Mar  8 12:07:19 2002
***************
*** 97,103 ****
  RECURSIVE_TARGETS += install-info-recursive
  .PHONY install-info: install-info-recursive
  else !%?SUBDIRS%
! install-info: install-info-am
  endif !%?SUBDIRS%
  endif %?INSTALL-INFO%
  
--- 97,103 ----
  RECURSIVE_TARGETS += install-info-recursive
  .PHONY install-info: install-info-recursive
  else !%?SUBDIRS%
! #install-info: install-info-am
  endif !%?SUBDIRS%
  endif %?INSTALL-INFO%