automake 1.5 and building install-info

[Karl Berry]

Texinfo has to build a program called `install-info'.  This conflicts
with automake's declaration of install-info: as a phony target.  I end
up with two sets of rules in the Makefile, one for the bin_PROGRAM
install-info and one for the phony install-info.

I had to do something, and I can't change the name of the program.  So I
changed the code to skip creating the phony target in the case of no
LOCAL-TEXIS (and no SUBDIRS).  Patch below.  This was the best
compromise I could think of -- since install-info is not a GNU standard
target, it doesn't seem necessary to generate it in directories where it
doesn't actually do anything.

Another possibility would be to always generate it -- but only in the
cygnus case, and skip it if non-cygnus.

In any case, we need to do something to avoid the conflict.

Thanks,
address@hidden

P.S. Taking it out of the list of required targets was the simplest way
to get out of the .PHONY list.  It's still generated in directories with
SUBDIRS, just not marked .PHONY.  Not ideal, but I didn't see offhand
how to conditionalize its phoniness.

*** /usr/local/gnu/bin/ORIG/automake    Wed Sep 12 06:40:05 2001
--- /usr/local/gnu/bin/automake Wed Sep 12 09:02:49 2001
***************
*** 467,473 ****
     'all'          => 1,
     'dvi'        => 1,
     'info'       => 1,
!    'install-info' => 1,
     'install'      => 1,
     'install-data' => 1,
     'install-exec' => 1,
--- 467,473 ----
     'all'          => 1,
     'dvi'        => 1,
     'info'       => 1,
! #   'install-info' => 1,
     'install'      => 1,
     'install-data' => 1,
     'install-exec' => 1,
*** /usr/local/gnu/share/automake/am/ORIG/texinfos.am   Wed Sep 12 08:35:55 2001
--- /usr/local/gnu/share/automake/am/texinfos.am        Wed Sep 12 08:58:18 2001
***************
*** 92,104 ****
  if %?LOCAL-TEXIS%
  _am_installdirs += $(DESTDIR)$(infodir)
  install-data-am: install-info-am
  endif %?LOCAL-TEXIS%
  if %?SUBDIRS%
  RECURSIVE_TARGETS += install-info-recursive
  .PHONY install-info: install-info-recursive
! else !%?SUBDIRS%
! install-info: install-info-am
! endif !%?SUBDIRS%
  endif %?INSTALL-INFO%
  
  .PHONY: install-info-am
--- 92,105 ----
  if %?LOCAL-TEXIS%
  _am_installdirs += $(DESTDIR)$(infodir)
  install-data-am: install-info-am
+ if !%?SUBDIRS%
+ install-info: install-info-am
+ endif !%?SUBDIRS%
  endif %?LOCAL-TEXIS%
  if %?SUBDIRS%
  RECURSIVE_TARGETS += install-info-recursive
  .PHONY install-info: install-info-recursive
! endif %?SUBDIRS%
  endif %?INSTALL-INFO%
  
  .PHONY: install-info-am