[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13-16-gd
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13-16-gd7bc522 |
|
Date: |
Mon, 31 Dec 2012 13:47:39 +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=d7bc52272f6e841d1b0813a78fba5102d55c9700
The branch, maint has been updated
via d7bc52272f6e841d1b0813a78fba5102d55c9700 (commit)
via 5470c2dd9a594dc3cec553cd8ee052841ee5b8bd (commit)
via 924ef267ffd8602dcc0be71c589655812fbe4d85 (commit)
via 162f61c8f8fc7ee14c9597faa5ac7e6695e52e8d (commit)
via 506f6ce8326e4a96525700eb8052919c9294a06e (commit)
via 767f8320eba745da0d829e51b8cf0e82a00c1bbb (commit)
via ac5c1d7782732c7245bcd8a2cbe63fefdafeda99 (commit)
via b6602b334c016042e252545d16733b7d5678fd90 (commit)
from 3e35245c5f6aae5594b00ffe3611a4955d115be5 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
automake.in | 10 ++++
doc/automake.texi | 2 +-
lib/Automake/Options.pm | 3 +
lib/am/texinfos.am | 2 -
m4/obsolete-err.m4 | 3 +
t/list-of-tests.mk | 54 +++++++++----------
t/{txinfo26.sh => txinfo-absolute-srcdir-pr408.sh} | 0
t/{txinfo8.sh => txinfo-add-missing-and-dist.sh} | 0
t/{txinfo32.sh => txinfo-bsd-make-recurs.sh} | 0
t/{txinfo33.sh => txinfo-clean.sh} | 0
t/{txinfo10.sh => txinfo-dvi-recurs.sh} | 0
t/{txinfo16.sh => txinfo-info-in-srcdir.sh} | 0
...fo20.sh => txinfo-makeinfo-error-no-clobber.sh} | 0
t/{txinfo21.sh => txinfo-many-output-formats.sh} | 0
t/{txinfo2.sh => txinfo-no-extra-dist.sh} | 28 ++++++++---
t/{txinfo27.sh => txinfo-no-installinfo.sh} | 0
t/{txinfo9.sh => txinfo-no-repeated-targets.sh} | 0
t/{txinfo6.sh => txinfo-other-suffixes.sh} | 4 +-
t/{txinfo29.sh => txinfo-override-infodeps.sh} | 0
t/{txinfo22.sh => txinfo-override-texinfo-tex.sh} | 0
t/{txinfo17.sh => txinfo-setfilename-repeated.sh} | 0
...nfo31.sh => txinfo-setfilename-suffix-strip.sh} | 8 ++-
t/{txinfo13.sh => txinfo-subdir-pr343.sh} | 7 ---
t/{txinfo.sh => txinfo-tex-dist.sh} | 0
...info4.sh => txinfo-unrecognized-info-suffix.sh} | 0
t/{vtexi.sh => txinfo-vtexi.sh} | 0
t/{vtexi2.sh => txinfo-vtexi2.sh} | 0
t/{vtexi3.sh => txinfo-vtexi3.sh} | 4 +-
t/{vtexi4.sh => txinfo-vtexi4.sh} | 4 +-
t/{txinfo3.sh => txinfo-without-info-suffix.sh} | 0
t/txinfo7.sh | 33 ------------
31 files changed, 77 insertions(+), 85 deletions(-)
rename t/{txinfo26.sh => txinfo-absolute-srcdir-pr408.sh} (100%)
rename t/{txinfo8.sh => txinfo-add-missing-and-dist.sh} (100%)
rename t/{txinfo32.sh => txinfo-bsd-make-recurs.sh} (100%)
rename t/{txinfo33.sh => txinfo-clean.sh} (100%)
rename t/{txinfo10.sh => txinfo-dvi-recurs.sh} (100%)
rename t/{txinfo16.sh => txinfo-info-in-srcdir.sh} (100%)
rename t/{txinfo20.sh => txinfo-makeinfo-error-no-clobber.sh} (100%)
rename t/{txinfo21.sh => txinfo-many-output-formats.sh} (100%)
rename t/{txinfo2.sh => txinfo-no-extra-dist.sh} (60%)
rename t/{txinfo27.sh => txinfo-no-installinfo.sh} (100%)
rename t/{txinfo9.sh => txinfo-no-repeated-targets.sh} (100%)
rename t/{txinfo6.sh => txinfo-other-suffixes.sh} (88%)
rename t/{txinfo29.sh => txinfo-override-infodeps.sh} (100%)
rename t/{txinfo22.sh => txinfo-override-texinfo-tex.sh} (100%)
rename t/{txinfo17.sh => txinfo-setfilename-repeated.sh} (100%)
rename t/{txinfo31.sh => txinfo-setfilename-suffix-strip.sh} (84%)
rename t/{txinfo13.sh => txinfo-subdir-pr343.sh} (86%)
rename t/{txinfo.sh => txinfo-tex-dist.sh} (100%)
rename t/{txinfo4.sh => txinfo-unrecognized-info-suffix.sh} (100%)
rename t/{vtexi.sh => txinfo-vtexi.sh} (100%)
rename t/{vtexi2.sh => txinfo-vtexi2.sh} (100%)
rename t/{vtexi3.sh => txinfo-vtexi3.sh} (95%)
rename t/{vtexi4.sh => txinfo-vtexi4.sh} (94%)
rename t/{txinfo3.sh => txinfo-without-info-suffix.sh} (100%)
delete mode 100755 t/txinfo7.sh
diff --git a/automake.in b/automake.in
index 3194c99..805e0e9 100644
--- a/automake.in
+++ b/automake.in
@@ -2131,6 +2131,7 @@ sub handle_source_transform ($$$$%)
msg_var ('unsupported', $ext_var, $ext_var->name . " can assume at most
one value")
if $default_source_ext =~ /[\t ]/;
(my $default_source = $unxformed) =~
s,(\.[^./\\]*)?$,$default_source_ext,;
+ # TODO: Remove this backward-compatibility hack in Automake 1.14.
if ($old_default_source ne $default_source
&& !$ext_var
&& (rule $old_default_source
@@ -2992,6 +2993,8 @@ sub scan_texinfo_file ($)
next if $outfile;
$outfile = $1;
+ # TODO: In Automake 1.14 (or even 1.13.2), start warning against
+ # TODO: suffixes != ".info", to ease transition to Automake-NG.
if ($outfile =~ /\.([^.]+)$/ && $1 ne 'info')
{
error ("$filename:$.",
@@ -3014,6 +3017,8 @@ sub scan_texinfo_file ($)
}
my $infobase = basename ($filename);
+ # TODO: In Automake 1.14 (or even 1.13.2), start warning against
+ # TODO: suffixes != ".texi", to ease transition to Automake-NG.
$infobase =~ s/\.te?xi(nfo)?$//;
return ($outfile, $vfile);
}
@@ -3142,6 +3147,8 @@ sub handle_texinfo_helper ($)
($info_texinfos->value_as_list_recursive (inner_expand => 1))
{
my $infobase = $texi;
+ # TODO: In Automake 1.14 (or even 1.13.2), start warning against
+ # TODO: suffixes != ".texi", to ease transition to Automake-NG.
$infobase =~ s/\.(txi|texinfo|texi)$//;
if ($infobase eq $texi)
@@ -4134,6 +4141,9 @@ sub handle_configure ($$$@)
# Distribute and define mkinstalldirs only if it is already present
# in the package, for backward compatibility (some people may still
# use $(mkinstalldirs)).
+ # TODO: start warning about this in Automake 1.13.2, and have
+ # TODO: Automake 1.14 or 1.15 drop it (and the mkinstalldirs script
+ # TODO: as well).
my $mkidpath = "$config_aux_dir/mkinstalldirs";
if (-f $mkidpath)
{
diff --git a/doc/automake.texi b/doc/automake.texi
index d2e3b38..78131a7 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7972,7 +7972,7 @@ passed to @code{makeinfo} when building @file{.info}
files; and
@samp{$(AM_MAKEINFOHTMLFLAGS)} is used when building @file{.html}
files.
address@hidden Keep in sync with txinfo21.sh
address@hidden Keep in sync with txinfo-many-output-formats.sh
For instance, the following setting can be used to obtain one single
@file{.html} file per manual, without node separators.
@example
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 186d4ca..9e06599 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -315,16 +315,19 @@ sub _process_option_list (\%@)
{
set_strictness ($_);
}
+ # TODO: Remove this special check in Automake 1.14 or 1.15.
elsif (/^(.*\/)?ansi2knr$/)
{
# Obsolete (and now removed) de-ANSI-fication support.
error ($where,
"automatic de-ANSI-fication support has been removed");
}
+ # TODO: Remove this special check in Automake 1.15.
elsif ($_ eq 'cygnus')
{
error $where, "support for Cygnus-style trees has been removed";
}
+ # TODO: Remove this special check in Automake 1.14 or 1.15.
elsif ($_ eq 'dist-lzma')
{
error ($where, "support for lzma-compressed distribution " .
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 6d45c95..790674c 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -79,13 +79,11 @@ endif ! %?LOCAL-TEXIS%
## if the user doesn't request it not to be run (through the
## 'AM_UPDATE_INFO_DIR' environment variable). See automake bug#9773
## and Debian Bug#543992.
-if %?FIRST%
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-endif
## Look in both . and srcdir because the info pages might have been
## rebuilt in the build directory. Can't cd to srcdir; that might
diff --git a/m4/obsolete-err.m4 b/m4/obsolete-err.m4
index eb23dc4..01c2d6e 100644
--- a/m4/obsolete-err.m4
+++ b/m4/obsolete-err.m4
@@ -8,16 +8,19 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+dnl TODO: Remove in Automake 1.15.
AC_DEFUN([AM_CONFIG_HEADER],
[AC_FATAL(['$0': this macro is obsolete.
You should use the 'AC][_CONFIG_HEADERS' macro instead.])])
+dnl TODO: Remove in Automake 1.15.
AC_DEFUN([AM_PROG_CC_STDC],
[AC_FATAL(['$0': this macro is obsolete.
You should simply use the 'AC][_PROG_CC' macro instead.
Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
but upon 'ac_cv_prog_cc_stdc'.])])
+dnl TODO: Remove in Automake 1.14.
AC_DEFUN([AM_C_PROTOTYPES],
[AC_FATAL([automatic de-ANSI-fication support has been removed])])
AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 4fe8216..3c27e8f 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -41,7 +41,6 @@ t/remake-timing-bug-pr8365.sh \
t/lex-subobj-nodep.sh \
t/remake-am-pr10111.sh \
t/remake-m4-pr10111.sh \
-t/txinfo5.sh \
$(perl_fake_XFAIL_TESTS)
perl_TESTS = \
@@ -1158,34 +1157,37 @@ t/target-cflags.sh \
t/targetclash.sh \
t/tests-environment-fd-redirect.sh \
t/tests-environment-and-log-compiler.sh \
-t/txinfo.sh \
-t/txinfo2.sh \
-t/txinfo3.sh \
-t/txinfo4.sh \
-t/txinfo6.sh \
-t/txinfo7.sh \
-t/txinfo8.sh \
-t/txinfo9.sh \
-t/txinfo10.sh \
-t/txinfo13.sh \
-t/txinfo16.sh \
-t/txinfo17.sh \
+t/txinfo-absolute-srcdir-pr408.sh \
+t/txinfo-add-missing-and-dist.sh \
+t/txinfo-bsd-make-recurs.sh \
+t/txinfo-clean.sh \
+t/txinfo-dvi-recurs.sh \
+t/txinfo-info-in-srcdir.sh \
+t/txinfo-makeinfo-error-no-clobber.sh \
+t/txinfo-many-output-formats.sh \
+t/txinfo-no-clutter.sh \
+t/txinfo-no-extra-dist.sh \
+t/txinfo-no-installinfo.sh \
+t/txinfo-no-repeated-targets.sh \
+t/txinfo-other-suffixes.sh \
+t/txinfo-override-infodeps.sh \
+t/txinfo-override-texinfo-tex.sh \
+t/txinfo-setfilename-repeated.sh \
+t/txinfo-setfilename-suffix-strip.sh \
+t/txinfo-subdir-pr343.sh \
+t/txinfo-tex-dist.sh \
+t/txinfo-unrecognized-extension.sh \
+t/txinfo-unrecognized-info-suffix.sh \
+t/txinfo-vtexi.sh \
+t/txinfo-vtexi2.sh \
+t/txinfo-vtexi3.sh \
+t/txinfo-vtexi4.sh \
+t/txinfo-without-info-suffix.sh \
t/txinfo19.sh \
-t/txinfo20.sh \
-t/txinfo21.sh \
-t/txinfo22.sh \
t/txinfo23.sh \
t/txinfo24.sh \
t/txinfo25.sh \
-t/txinfo26.sh \
-t/txinfo27.sh \
t/txinfo28.sh \
-t/txinfo29.sh \
-t/txinfo31.sh \
-t/txinfo32.sh \
-t/txinfo33.sh \
-t/txinfo-no-clutter.sh \
-t/txinfo-unrecognized-extension.sh \
t/transform.sh \
t/transform2.sh \
t/transform3.sh \
@@ -1220,10 +1222,6 @@ t/version6.sh \
t/version7.sh \
t/version8.sh \
t/vpath.sh \
-t/vtexi.sh \
-t/vtexi2.sh \
-t/vtexi3.sh \
-t/vtexi4.sh \
t/warnings-obsolete-default.sh \
t/warnings-override.sh \
t/warnings-precedence.sh \
diff --git a/t/txinfo26.sh b/t/txinfo-absolute-srcdir-pr408.sh
similarity index 100%
rename from t/txinfo26.sh
rename to t/txinfo-absolute-srcdir-pr408.sh
diff --git a/t/txinfo8.sh b/t/txinfo-add-missing-and-dist.sh
similarity index 100%
rename from t/txinfo8.sh
rename to t/txinfo-add-missing-and-dist.sh
diff --git a/t/txinfo32.sh b/t/txinfo-bsd-make-recurs.sh
similarity index 100%
rename from t/txinfo32.sh
rename to t/txinfo-bsd-make-recurs.sh
diff --git a/t/txinfo33.sh b/t/txinfo-clean.sh
similarity index 100%
rename from t/txinfo33.sh
rename to t/txinfo-clean.sh
diff --git a/t/txinfo10.sh b/t/txinfo-dvi-recurs.sh
similarity index 100%
rename from t/txinfo10.sh
rename to t/txinfo-dvi-recurs.sh
diff --git a/t/txinfo16.sh b/t/txinfo-info-in-srcdir.sh
similarity index 100%
rename from t/txinfo16.sh
rename to t/txinfo-info-in-srcdir.sh
diff --git a/t/txinfo20.sh b/t/txinfo-makeinfo-error-no-clobber.sh
similarity index 100%
rename from t/txinfo20.sh
rename to t/txinfo-makeinfo-error-no-clobber.sh
diff --git a/t/txinfo21.sh b/t/txinfo-many-output-formats.sh
similarity index 100%
rename from t/txinfo21.sh
rename to t/txinfo-many-output-formats.sh
diff --git a/t/txinfo2.sh b/t/txinfo-no-extra-dist.sh
similarity index 60%
rename from t/txinfo2.sh
rename to t/txinfo-no-extra-dist.sh
index c5e0e47..ea8f89e 100755
--- a/t/txinfo2.sh
+++ b/t/txinfo-no-extra-dist.sh
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test to ensure that a ".info~" file doesn't end up in the
-# distribution. Bug report from Greg McGary.
+# Test to ensure that a ".info~" or ".info.bak" file doesn't end up
+# in the distribution. Bug report from Greg McGary.
. test-init.sh
@@ -24,22 +24,36 @@ AC_OUTPUT
END
cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-.PHONY: test
-test:
+info_TEXINFOS = textutils.texi subdir/main.texi
+test: distdir
@echo DISTFILES = $(DISTFILES)
- case '$(DISTFILES)' in *'~'*) exit 1;; *) exit 0;; esac
+ @case '$(DISTFILES)' in *'~'*|*'.bak'*) exit 1;; *) exit 0;; esac
+ st=0; \
+ find $(distdir) | grep '~' && st=1; \
+ find $(distdir) | grep '\.bak' && st=1; \
+ exit $$st
+PHONY: test
END
: > texinfo.tex
+mkdir subdir
echo '@setfilename textutils.info' > textutils.texi
-: > textutils.info~
+echo '@setfilename main.info' > subdir/main.texi
$ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure
+: > textutils.info
+: > subdir/main.info
+: > textutils.info~
+: > textutils.info.bak
+: > subdir/main.info~
+: > subdir/main.info.bak
$MAKE test
+$MAKE maintainer-clean
+test -f subdir/main.info~
+test -f subdir/main.info.bak
:
diff --git a/t/txinfo27.sh b/t/txinfo-no-installinfo.sh
similarity index 100%
rename from t/txinfo27.sh
rename to t/txinfo-no-installinfo.sh
diff --git a/t/txinfo9.sh b/t/txinfo-no-repeated-targets.sh
similarity index 100%
rename from t/txinfo9.sh
rename to t/txinfo-no-repeated-targets.sh
diff --git a/t/txinfo6.sh b/t/txinfo-other-suffixes.sh
similarity index 88%
rename from t/txinfo6.sh
rename to t/txinfo-other-suffixes.sh
index 549ead8..5af4376 100755
--- a/t/txinfo6.sh
+++ b/t/txinfo-other-suffixes.sh
@@ -19,15 +19,17 @@
. test-init.sh
cat > Makefile.am << 'END'
-info_TEXINFOS = foo.txi
+info_TEXINFOS = foo.txi bar.texinfo
END
echo '@setfilename foo.info' > foo.txi
+echo '@setfilename bar.info' > bar.texinfo
: > texinfo.tex
$ACLOCAL
$AUTOMAKE
grep '^\.txi\.info: *$' Makefile.in
+grep '^\.texinfo\.info: *$' Makefile.in
:
diff --git a/t/txinfo29.sh b/t/txinfo-override-infodeps.sh
similarity index 100%
rename from t/txinfo29.sh
rename to t/txinfo-override-infodeps.sh
diff --git a/t/txinfo22.sh b/t/txinfo-override-texinfo-tex.sh
similarity index 100%
rename from t/txinfo22.sh
rename to t/txinfo-override-texinfo-tex.sh
diff --git a/t/txinfo17.sh b/t/txinfo-setfilename-repeated.sh
similarity index 100%
rename from t/txinfo17.sh
rename to t/txinfo-setfilename-repeated.sh
diff --git a/t/txinfo31.sh b/t/txinfo-setfilename-suffix-strip.sh
similarity index 84%
rename from t/txinfo31.sh
rename to t/txinfo-setfilename-suffix-strip.sh
index 567e28f..8526d53 100755
--- a/t/txinfo31.sh
+++ b/t/txinfo-setfilename-suffix-strip.sh
@@ -14,7 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure file extensions are matched correctly.
+# Make sure file extensions are matched correctly in the code
+# parsing texi files for @setfilename declarations.
# Report from Eric Dorland.
. test-init.sh
@@ -25,5 +26,8 @@ cat >bar.texi <<EOF
EOF
$ACLOCAL
-$AUTOCONF
$AUTOMAKE --add-missing
+
+$EGREP '[ /]bar-1\.9\.info( |$)' Makefile.in
+
+:
diff --git a/t/txinfo13.sh b/t/txinfo-subdir-pr343.sh
similarity index 86%
rename from t/txinfo13.sh
rename to t/txinfo-subdir-pr343.sh
index 374c44a..0ecb4bf 100755
--- a/t/txinfo13.sh
+++ b/t/txinfo-subdir-pr343.sh
@@ -15,8 +15,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check for subdir Texinfo (PR/343).
-# Also make sure we do not distribute too much foo.info* files (Report
-# from Vincent Lefevre).
required='makeinfo tex texi2dvi'
. test-init.sh
@@ -29,8 +27,6 @@ subdir_main_TEXINFOS = subdir/inc.texi
installcheck-local:
test -f "$(infodir)/main.info"
-check-local:
- test ! -f $(srcdir)/subdir/main.info.bak
END
mkdir subdir
@@ -50,8 +46,6 @@ cat > subdir/inc.texi << 'END'
I'm included.
END
-touch subdir/main.info.bak
-
$ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
@@ -62,6 +56,5 @@ cd build
$MAKE distcheck
test -f ../subdir/main.info
test ! -e subdir/main.info
-test -f ../subdir/main.info.bak
:
diff --git a/t/txinfo.sh b/t/txinfo-tex-dist.sh
similarity index 100%
rename from t/txinfo.sh
rename to t/txinfo-tex-dist.sh
diff --git a/t/txinfo4.sh b/t/txinfo-unrecognized-info-suffix.sh
similarity index 100%
rename from t/txinfo4.sh
rename to t/txinfo-unrecognized-info-suffix.sh
diff --git a/t/vtexi.sh b/t/txinfo-vtexi.sh
similarity index 100%
rename from t/vtexi.sh
rename to t/txinfo-vtexi.sh
diff --git a/t/vtexi2.sh b/t/txinfo-vtexi2.sh
similarity index 100%
rename from t/vtexi2.sh
rename to t/txinfo-vtexi2.sh
diff --git a/t/vtexi3.sh b/t/txinfo-vtexi3.sh
similarity index 95%
rename from t/vtexi3.sh
rename to t/txinfo-vtexi3.sh
index a49579a..dc45d07 100755
--- a/t/vtexi3.sh
+++ b/t/txinfo-vtexi3.sh
@@ -17,8 +17,8 @@
# Check that vers*.texi files are automatically created and distributed
# if @included into a texi source. Also check that they correctly contain
# the @values definitions they are advertised to.
-# See also the related test 'vtexi4.sh', which does similar checks, but
-# for version.texi only, and requires makeinfo, tex and texi2dvi.
+# See also the related test 'txinfo-vtexi4.sh', which does similar checks,
+# but for version.texi only, and requires makeinfo, tex and texi2dvi.
. test-init.sh
diff --git a/t/vtexi4.sh b/t/txinfo-vtexi4.sh
similarity index 94%
rename from t/vtexi4.sh
rename to t/txinfo-vtexi4.sh
index 97345ac..854ee56 100755
--- a/t/vtexi4.sh
+++ b/t/txinfo-vtexi4.sh
@@ -17,8 +17,8 @@
# Check that the version.texi file is automatically created and distributed
# if @included into a texi source. Also check that is correctly defined
# @values definitions it is advertised to.
-# See also the related test 'vtexi3.sh', which does similar checks, but
-# for more vers*.texi files, and does not require makeinfo, tex and
+# See also the related test 'txinfo-vtexi4.sh', which does similar checks,
+# but for more vers*.texi files, and does not require makeinfo, tex and
# texi2dvi.
required='makeinfo tex texi2dvi grep-nonprint'
diff --git a/t/txinfo3.sh b/t/txinfo-without-info-suffix.sh
similarity index 100%
rename from t/txinfo3.sh
rename to t/txinfo-without-info-suffix.sh
diff --git a/t/txinfo7.sh b/t/txinfo7.sh
deleted file mode 100755
index 8d72054..0000000
--- a/t/txinfo7.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1998-2012 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure texinfo.tex correctly installed by -a. Bug report
-# by Per Cederqvist.
-
-. test-init.sh
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = textutils.texi
-END
-
-echo '@setfilename textutils.info' > textutils.texi
-
-$ACLOCAL
-$AUTOMAKE -a
-
-test -f texinfo.tex
-
-:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.13-16-gd7bc522,
Stefano Lattarini <=