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.

diff --git a/ChangeLog b/ChangeLog
index eef7e2f8542b3551aba57bd8671ff17b83b9d329..7214c1944fae980f8eb0dc73847ac722f333bf1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <bruno@clisp.org>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/THANKS b/THANKS
index 6aa4057f52733f70594548b427a2942649880d64..58aa2b921985b073b6c9a125d10aefdcd6dfd89d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -70,6 +70,7 @@ Diab Jerius           djerius@cfa.harvard.edu
 Didier Cassirame       faded@free.fr
 Dieter Baron           dillo@stieltjes.smc.univie.ac.at
 Dieter Jurzitza                DJurzitza@harmanbecker.com
+Dilyan Palauzov                Dilyan.Palauzov@aegee.org
 Dmitry Mikhin          dmitrym@acres.com.au
 Doug Evans             devans@cygnus.com
 Duncan Gibson          duncan@thermal.esa.int
@@ -268,6 +269,7 @@ Robert Swafford             robert.swafford@l-3com.com
 Roberto Bagnara                bagnara@cs.unipr.it
 Roman Fietze           roman.fietze@telemotive.de
 Ronald Landheer                ronald@landheer.com
+Roumen Petrov          bugtrack@roumenpetrov.info
 Rusty Ballinger                rusty@rlyeh.engr.sgi.com
 Ryan T. Sammartino     ryants@shaw.ca
 Sam Hocevar            sam@zoy.org

diff --git a/doc/automake.texi b/doc/automake.texi
index e32b7c5e4689b4e5e497d84d6f4c1908fbc66059..e1c0c31f3f5f593535ca312704f263a7f7e4f867 100644 (file)
--- 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
-@code{TEXINFO_TEX} variable, see below).  However, if you used
-@code{AC_CONFIG_AUX_DIR} in @file{configure.ac} (@pxref{Input, , Finding
-`configure' Input, autoconf, The Autoconf Manual}), then
-@file{texinfo.tex} is looked for there.  Automake supplies
-@file{texinfo.tex} if @option{--add-missing} is given.
-
-@opindex no-texinfo.tex
+the same directory as the @file{Makefile.am} file that lists the
+@file{.texi} files.  If you used @code{AC_CONFIG_AUX_DIR} in
+@file{configure.ac} (@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
+@option{--add-missing} 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 29869fea5d9606c6bf1a994c587f93cee271a759..f82d691349fd898c12ac233d40d78d9f575d2d49 100755 (executable)
--- 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