[SCM] GNU Automake branch, master, updated. Release-1-10-102-g541518f

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=541518fed16c47776ff428597e892da067343c77

The branch, master has been updated
       via  541518fed16c47776ff428597e892da067343c77 (commit)
      from  99d18f4a8b9ab4fc85e823bddb6ed046e36bf4dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 541518fed16c47776ff428597e892da067343c77
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Jan 10 20:49:07 2008 +0100

    Clarify texinfo.tex and TEXINFO_TEX semantics.
    
    * doc/automake.texi (Texinfo): Clarify that by default,
    texinfo.tex is searched in the same directory as the Makefile.am
    that needs it.  Clarify that TEXINFO_TEX has precedence over
    AC_CONFIG_AUX_DIR, and that it requires the user to install and
    distribute it.
    * tests/txinfo22.test: Ensure TEXINFO_TEX is not distributed.
    * THANKS: Update.
    Reports by Dilyan Palauzov and Roumen Petrov.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   12 ++++++++++++
 THANKS              |    2 ++
 doc/automake.texi   |   17 +++++++++--------
 tests/txinfo22.test |    6 +++++-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eef7e2f..7214c19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-12  Ralf Wildenhues  <address@hidden>
+
+       Clarify texinfo.tex and TEXINFO_TEX semantics.
+       * doc/automake.texi (Texinfo): Clarify that by default,
+       texinfo.tex is searched in the same directory as the Makefile.am
+       that needs it.  Clarify that TEXINFO_TEX has precedence over
+       AC_CONFIG_AUX_DIR, and that it requires the user to install and
+       distribute it.
+       * tests/txinfo22.test: Ensure TEXINFO_TEX is not distributed.
+       * THANKS: Update.
+       Reports by Dilyan Palauzov and Roumen Petrov.
+
 2008-01-11  Bruno Haible  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/THANKS b/THANKS
index 6aa4057..58aa2b9 100644
--- a/THANKS
+++ b/THANKS
@@ -70,6 +70,7 @@ Diab Jerius           address@hidden
 Didier Cassirame       address@hidden
 Dieter Baron           address@hidden
 Dieter Jurzitza                address@hidden
+Dilyan Palauzov                address@hidden
 Dmitry Mikhin          address@hidden
 Doug Evans             address@hidden
 Duncan Gibson          address@hidden
@@ -268,6 +269,7 @@ Robert Swafford             address@hidden
 Roberto Bagnara                address@hidden
 Roman Fietze           address@hidden
 Ronald Landheer                address@hidden
+Roumen Petrov          address@hidden
 Rusty Ballinger                address@hidden
 Ryan T. Sammartino     address@hidden
 Sam Hocevar            address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index e32b7c5..e1c0c31 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7481,14 +7481,15 @@ hello_TEXINFOS = gpl.texi
 @cindex @file{texinfo.tex}
 
 By default, Automake requires the file @file{texinfo.tex} to appear in
-the same directory as the Texinfo source (this can be changed using the
address@hidden variable, see below).  However, if you used
address@hidden in @file{configure.ac} (@pxref{Input, , Finding
-`configure' Input, autoconf, The Autoconf Manual}), then
address@hidden is looked for there.  Automake supplies
address@hidden if @option{--add-missing} is given.
-
address@hidden no-texinfo.tex
+the same directory as the @file{Makefile.am} file that lists the
address@hidden files.  If you used @code{AC_CONFIG_AUX_DIR} in
address@hidden (@pxref{Input, , Finding `configure' Input,
+autoconf, The Autoconf Manual}), then @file{texinfo.tex} is looked for
+there.  In both cases, automake then supplies @file{texinfo.tex} if
address@hidden is given, and takes care of its distribution.
+However, if you set the @code{TEXINFO_TEX} variable (see below),
+it overrides the location of the file and turns off its installation
+into the source as well as its distribution.
 
 The option @option{no-texinfo.tex} can be used to eliminate the
 requirement for the file @file{texinfo.tex}.  Use of the variable
diff --git a/tests/txinfo22.test b/tests/txinfo22.test
index 29869fe..f82d691 100755
--- a/tests/txinfo22.test
+++ b/tests/txinfo22.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 2008  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 # Report from Tom Tromey.
 # Also make sure Automake ignores in-line comments when using variables,
 # but preserve them in the output.
+# Also make sure TEXINFO_TEX is not distributed.
 
 required='makeinfo tex'
 . ./defs || exit 1
@@ -40,6 +41,8 @@ info_TEXINFOS = main.texi
 sure_it_exists:
        test -f $(TEXINFO_TEX)
        test -d "$(am__TEXINFO_TEX_DIR)"
+sure_it_is_not_distributed: distdir
+       test ! -f $(distdir)/tex/texinfo.tex
 END
 
 cat > main.texi << 'END'
@@ -67,3 +70,4 @@ test -f tex/texinfo.tex
 $MAKE sure_it_exists
 $MAKE distcheck
 grep 'TEXINFO_TEX = .* # some comment w/ a slash' Makefile
+$MAKE sure_it_is_not_distributed


hooks/post-receive
--
GNU Automake