added no-texinfo.tex option

diff --git a/ChangeLog b/ChangeLog
index 9027b0d..48aa76c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Jan  7 17:59:26 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (scan_one_configure_file): AM_INIT_GUILE_MODULE runs
+       AM_PROG_INSTALL, not AC_PROG_INSTALL.  From Jim Blandy.
+       (handle_texinfo): Handle no-texinfo.tex option.
+       (handle_options): Ditto.
+
+Thu Jan  2 14:16:17 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (am_install_var): Ignore EXTRA libtool libraries.
+       From Marius Vollmer.
+
 Wed Dec 18 15:27:09 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (read_am_file): Sort configure_vars before adding to

diff --git a/THANKS b/THANKS
index b20a717..d4071a2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -23,6 +23,7 @@ Joerg-Martin Schwarz <jms@jms.prima.ruhr.de>
 Josh MacDonald <jmacd@cs.berkeley.edu>
 Joshua Cowan <jcowan@jcowan.reslife.okstate.edu>
 Karl Berry <kb@cs.umb.edu>
+Marius Vollmer <mvo@zagadka.ping.de>
 Mark Galassi <rosalia@nis.lanl.gov>
 Markku Rossi <mtr@ngs.fi>
 Noah Friedman <friedman@gnu.ai.mit.edu>

diff --git a/automake.in b/automake.in
index 6a477d3..c4f83f3 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -568,7 +568,8 @@ sub handle_options
        }
        elsif ($_ eq 'no-installman' || $_ eq 'no-installinfo'
               || $_ eq 'dist-shar' || $_ eq 'dist-zip'
-              || $_ eq 'dist-tarZ' || $_ eq 'dejagnu')
+              || $_ eq 'dist-tarZ' || $_ eq 'dejagnu'
+              || $_ eq 'no-texinfo.tex')
        {
            # Explicitly recognize these.
        }
@@ -1658,7 +1659,8 @@ sub handle_texinfo
     # when in Cygnus mode -- a bletcherous hack.
     &require_file_with_line ('info_TEXINFOS',
                             $cygnus_mode ? $GNU : $FOREIGN,
-                            'texinfo.tex');
+                            'texinfo.tex')
+       unless defined $options{'no-texinfo.tex'};
 }
 
 # Handle any man pages.
@@ -3381,7 +3383,7 @@ sub scan_one_configure_file
            $seen_package = 1;
            $seen_version = 1;
            $seen_arg_prog = 1;
-           $seen_prog_install = 1;
+           $seen_prog_install = 2;
            @config_aux_path = ('..');
        }
 
@@ -4442,8 +4444,10 @@ sub am_install_var
                            $seen_libtool = 1;
                        }
 
-                       # Check that libtool libraries go only into libdir.
-                       if ($rcurs =~ /^lib.*\.la$/ && $X ne 'lib')
+                       # Check that libtool libraries go only into
+                       # libdir.  Ignore `EXTRA' libtool libraries.
+                       if ($rcurs =~ /^lib.*\.la$/ && $X ne 'lib'
+                           && $X ne 'EXTRA')
                        {
                            &am_line_error ($one_name,
                                            "libtool library \`$rcurs' must only be installed in libdir");

diff --git a/automake.texi b/automake.texi
index df92dc6..322edb4 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -1484,7 +1484,10 @@ kpathsea_TEXINFOS = install.texi copying.texi freedom.texi
 By default, Automake requires the file @file{texinfo.tex} to appear in
 the same directory as the Texinfo source.  However, if you used
 @code{AC_CONFIG_AUX_DIR} in @file{configure.in}, then @file{texinfo.tex}
-is looked for there.  Automake supplies @file{texinfo.tex}.
+is looked for there.  Automake supplies @file{texinfo.tex} if
+@samp{--add-missing} is given.  The option @samp{no-texinfo.tex} can be
+used to eliminate the requirement for @file{texinfo.tex}; this is useful
+if manuals appear in many directories.
 
 Automake generates an @code{install-info} target; some people apparently
 use this.  By default, info pages are installed by @samp{make install}.
@@ -1732,6 +1735,10 @@ is useful for those situations where you don't have the necessary bits
 to make automatic dependency tracking work @xref{Dependencies}.  In this
 case the effect is to effectively disable automatic dependency tracking.
 
+@item @code{no-texinfo.tex}
+Don't require @file{texinfo.tex}, even if there are texinfo files in
+this directory.
+
 @item @var{version}
 A version number (eg @samp{0.30}) can be specified.  If Automake is not
 newer than the version specified, creation of the @file{Makefile.in}