Hello Dilyan, Roumen,
Thanks for the bug reports.
* Dilyan Palauzov wrote on Sat, Jan 05, 2008 at 12:03:35AM CET:
>
> info_TEXINFOS = doc/xyz.text
> and running automake, I get the error "required file './texinfo.tex' not
> found.
* Roumen Petrov wrote on Mon, Jan 07, 2008 at 10:18:22PM CET:
>
> Yes , documentation is not correct. The paths for info files could be
> relative to Makefile.am, as example:
> info_TEXINFOS = doc1/foo1.texi doc2/foo2.texi
Yep. And I think it should remain that way, because otherwise we'd need
to somehow make the first .texi special or so.
> About TEXINFO_TEX :
> It is not clear that TEXINFO_TEX take precedence over AC_CONFIG_AUX_DIR.
It does.
> Also documentation don't inform us that automake don't install file
> specified by variable TEXINFO_TEX if automake option --add-missing is
> used.
automake doesn't.
* Roumen Petrov wrote on Mon, Jan 07, 2008 at 10:56:45PM CET:
> P.S.
> If TEXINFO_TEX is set should distribution include that file ?
The developer needs to take care of that. I think the idea with
TEXINFO_TEX is for example if you want to reuse that file from another
(sub)package in a package hierarchy; in that case that other package
takes care of automake -a and distribution.
Does this patch address all issues listed in this thread to your liking
(putting you both in THANKS; patch intended for master and branch-1-10)?
Thanks,
Ralf
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/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
[EMAIL PROTECTED] variable, see below). However, if you used
[EMAIL PROTECTED] in @file{configure.ac} (@pxref{Input, , Finding
-`configure' Input, autoconf, The Autoconf Manual}), then
[EMAIL PROTECTED] is looked for there. Automake supplies
[EMAIL PROTECTED] if @option{--add-missing} is given.
-
[EMAIL PROTECTED] no-texinfo.tex
+the same directory as the @file{Makefile.am} file that lists the
[EMAIL PROTECTED] files. If you used @code{AC_CONFIG_AUX_DIR} in
[EMAIL PROTECTED] (@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
[EMAIL PROTECTED] 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
