[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-57-gb83d2e
From: |
Ralf Wildenhues |
Subject: |
[SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-57-gb83d2e0 |
Date: |
Sat, 12 Jan 2008 14:30:16 +0000 |
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=b83d2e0782d7a9d0d4bc05551f3a50610ec5afc9
The branch, branch-1-10 has been updated
via b83d2e0782d7a9d0d4bc05551f3a50610ec5afc9 (commit)
from c9fbab87d63676d0e64b24ca39b8af7c4e46e402 (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 b83d2e0782d7a9d0d4bc05551f3a50610ec5afc9
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 ded92b8..e2b1f64 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 32ecb4c..c52779b 100644
--- a/THANKS
+++ b/THANKS
@@ -68,6 +68,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
@@ -266,6 +267,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 2bb8cc6..6ea6e46 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7471,14 +7471,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 d7b2979..61fb65b 100755
--- a/tests/txinfo22.test
+++ b/tests/txinfo22.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2008 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
@@ -22,6 +22,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
@@ -44,6 +45,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'
@@ -71,3 +74,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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-57-gb83d2e0,
Ralf Wildenhues <=