diff options
| author | Gavin Smith <gavinsmith0123@gmail.com> | 2019-08-25 21:07:58 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2019-09-02 10:05:07 -0700 |
| commit | 309a6c477eec80b847078699303c65ccd7787eb0 (patch) | |
| tree | a7cd7cab83e8b369ad6600f696172760c794a473 /bin | |
| parent | d89a1aadedd26b8caf97f7202766706b2480f524 (diff) | |
| download | automake-309a6c477eec80b847078699303c65ccd7787eb0.tar.gz | |
automake: do not require @setfilename in Texinfo files
Texinfo no longer requires a @setfilename directive in each
.texi file, so automake now also relaxes its restriction.
* bin/automake.in (scan_texinfo_file): Derive name of info file from
name of input file if no @setfilename line occurs in the file.
* t/txinfo-no-setfilename.sh: New test.
* t/list-of-tests.mk: Add it.
* NEWS: Mention it.
Fixes automake bugs #36921 and #34201.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/automake.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/automake.in b/bin/automake.in index b4ae8f43f..06f4ee9b2 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -1,7 +1,7 @@ #!@PERL@ -w # automake - create Makefile.in from Makefile.am -*- perl -*- # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2019 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 @@ -3083,8 +3083,10 @@ sub scan_texinfo_file if (! $outfile) { - err_am "'$filename' missing \@setfilename"; - return; + # Replace a .texi extension with .info + $outfile = basename($filename); + $outfile =~ s/\.[^.]+$//; + $outfile .= '.info'; } return ($outfile, $vfile); |