diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-15 22:52:36 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-17 09:57:34 +0200 |
commit | a0c7b6a3c28aec6673b7c2f489dd3dfc676605ad (patch) | |
tree | e561605452529331852ce83468ec3d71faa4073b /t/txinfo20.sh | |
parent | 5148089bd2a5d5c800c787199d18a2791a310864 (diff) | |
download | automake-a0c7b6a3c28aec6673b7c2f489dd3dfc676605ad.tar.gz |
[ng] texi: drop support for suffix-less info files
Such support is seldom used, and will get in the way of future, useful
refactorings. We can still re-introduce it at a later time, after the
dust is settled, if there are users' requests in this direction.
* automake.in (scan_texinfo_file): Error out if a input '.texi' file
specifies an output (in the '@setfilename' directive) that doesn't have
a '.info' extension.
(output_texinfo_build_rules): Simplify, by assuming generated info
files ought to have the '.info' extension.
* lib/am/texibuild.am: Likewise.
* NG-NEWS: Update
* t/txinfo3.sh: Remove as obsolete.
* t/txinfo-unrecognized-extension-2.sh: New test.
* t/primary-prefix-valid-couples.sh: Adjust to avoid spurious failures.
* t/txinfo17.sh: Likewise.
* t/txinfo20.sh: Likewise.
* t/vtexi2.sh: Likewise.
* t/mdate2.sh: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/txinfo20.sh')
-rwxr-xr-x | t/txinfo20.sh | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/t/txinfo20.sh b/t/txinfo20.sh index 5c07880c1..98c044ee4 100755 --- a/t/txinfo20.sh +++ b/t/txinfo20.sh @@ -29,7 +29,7 @@ mkdir sub cat > main.texi << 'END' \input texinfo -@setfilename main +@setfilename main.info @settitle main @node Top Hello walls. @@ -46,15 +46,15 @@ $AUTOCONF $MAKE # Feign more info files. -: > main-1 -: > sub/main-1 +: > main.info-1 +: > sub/main.info-1 # Break main.texi. $sleep cp main.texi main.old cat > main.texi << 'END' \input texinfo -@setfilename main +@setfilename main.info @settitle main @node Top @unknown_macro{Hello walls.} @@ -63,14 +63,16 @@ END # makeinfo will bail out, but we should conserve the old info files. $MAKE && Exit 1 -test -f main -test -f main-1 +test -f main.info +test -f main.info-1 # Restore main.texi, and break sub/main.texi. cp main.texi sub/main.texi mv main.old main.texi $MAKE && Exit 1 -test -f main -test ! -f main-1 -test -f sub/main -test -f sub/main-1 +test -f main.info +test ! -f main.info-1 +test -f sub/main.info +test -f sub/main.info-1 + +: |