diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2018-02-25 23:03:05 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2018-02-25 23:03:05 +0100 |
| commit | be971a1d87d84d94cc073fcd5dbc6e7105b4d011 (patch) | |
| tree | f530fc501658a6cc29d10fa3d5d9c1c08b193766 /t/txinfo-many-output-formats.sh | |
| parent | 9ec19184fe3df21f20417c4f73ffe46f9610b5c7 (diff) | |
| parent | 4f73bb80d1583441ed4a1c681a843fe4d9d5e26c (diff) | |
| download | automake-be971a1d87d84d94cc073fcd5dbc6e7105b4d011.tar.gz | |
Merge branch 'release' into maintmaint
Diffstat (limited to 't/txinfo-many-output-formats.sh')
| -rw-r--r-- | t/txinfo-many-output-formats.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/txinfo-many-output-formats.sh b/t/txinfo-many-output-formats.sh index 36e6e08b4..978417e60 100644 --- a/t/txinfo-many-output-formats.sh +++ b/t/txinfo-many-output-formats.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 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 @@ -12,7 +12,7 @@ # 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/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # Test support for building HTML documentation, and the many # install-DOC flavors. @@ -128,7 +128,8 @@ test ! -e sub/main2.html test ! -e rec/main3.html # Make sure AM_MAKEINFOHTMLFLAGS is supported, and override AM_MAKEINFO. - +# Ensure that MAKEINFOFLAGS is not used for the following targets by using an +# invalid option. cp $srcdir/Makefile.am $srcdir/Makefile.sav cat >> $srcdir/Makefile.am <<'EOF' AM_MAKEINFOHTMLFLAGS = --no-headers --no-split |