From 309a6c477eec80b847078699303c65ccd7787eb0 Mon Sep 17 00:00:00 2001 From: Gavin Smith Date: Sun, 25 Aug 2019 21:07:58 -0700 Subject: 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. --- bin/automake.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'bin') 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); -- cgit v1.2.1