From: Ralf Wildenhues Date: Thu, 10 Jan 2008 19:49:07 +0000 (+0100) Subject: Clarify texinfo.tex and TEXINFO_TEX semantics. X-Git-Tag: v1.10b~183 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=541518fed16c47776ff428597e892da067343c77;p=thirdparty%2Fautomake.git 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 eef7e2f85..7214c1944 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-01-12 Ralf Wildenhues + + 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 Ralf Wildenhues diff --git a/THANKS b/THANKS index 6aa4057f5..58aa2b921 100644 --- 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 e32b7c5e4..e1c0c31f3 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 -@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 29869fea5..f82d69134 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