summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorGavin Smith <gavinsmith0123@gmail.com>2019-08-25 21:07:58 -0700
committerJim Meyering <meyering@fb.com>2019-09-02 10:05:07 -0700
commit309a6c477eec80b847078699303c65ccd7787eb0 (patch)
treea7cd7cab83e8b369ad6600f696172760c794a473 /t
parentd89a1aadedd26b8caf97f7202766706b2480f524 (diff)
downloadautomake-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 't')
-rw-r--r--t/list-of-tests.mk1
-rw-r--r--t/txinfo-no-setfilename.sh35
2 files changed, 36 insertions, 0 deletions
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 84dd29af0..32fca8436 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1214,6 +1214,7 @@ t/txinfo-no-clutter.sh \
t/txinfo-no-extra-dist.sh \
t/txinfo-no-installinfo.sh \
t/txinfo-no-repeated-targets.sh \
+t/txinfo-no-setfilename.sh \
t/txinfo-other-suffixes.sh \
t/txinfo-override-infodeps.sh \
t/txinfo-override-texinfo-tex.sh \
diff --git a/t/txinfo-no-setfilename.sh b/t/txinfo-no-setfilename.sh
new file mode 100644
index 000000000..3ef1730de
--- /dev/null
+++ b/t/txinfo-no-setfilename.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+# Copyright (C) 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
+# 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 <https://www.gnu.org/licenses/>.
+
+# Check Texinfo files work without a @setfilename line
+
+. test-init.sh
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = file.texi
+END
+
+cat > file.texi << 'END'
+contents
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+
+grep 'file.info:' Makefile.in
+
+: