Merge remote-tracking branch 'origin/maint'

* origin/maint:
  maint: use *.texi.

Conflicts:
	doc/Makefile.am
	examples/calc++/Makefile.am
This commit is contained in:
Akim Demaille
2012-06-26 17:13:36 +02:00
4 changed files with 3 additions and 3 deletions

View File

@@ -20,7 +20,7 @@ TEST_LOG_COMPILER = $(top_srcdir)/examples/test
## Extracting. ##
## ------------ ##
doc = $(top_srcdir)/doc/bison.texinfo
doc = $(top_srcdir)/doc/bison.texi
extexi = $(top_srcdir)/examples/extexi
extract = VERSION="$(VERSION)" $(PERL) -f $(extexi) $(doc) --
extracted =