Merge remote-tracking branch 'origin/maint'

* origin/maint: maint: use *.texi. Conflicts: doc/Makefile.am examples/calc++/Makefile.am
2026-03-12 05:43:03 +00:00 · 2012-06-26 17:13:36 +02:00
parent 297e263a00 9bcffa0c13
commit 22b081deb7
4 changed files with 3 additions and 3 deletions
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
--- a/doc/bison.x
+++ b/doc/bison.x
@@ -39,7 +39,7 @@ This description of the options that can be given to
 is adapted from the node
 .B Invocation
 in the
-.B bison.texinfo
+.B bison.texi
 manual, which should be taken as authoritative.
 .PP
 .I Bison
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -14,7 +14,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.

 AM_MAKEINFOFLAGS = --no-split
-info_TEXINFOS = doc/bison.texinfo
+info_TEXINFOS = doc/bison.texi
 doc_bison_TEXINFOS =                            \
  $(CROSS_OPTIONS_TEXI)                         \
  doc/fdl.texi                                  \