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

@@ -39,7 +39,7 @@ This description of the options that can be given to
is adapted from the node is adapted from the node
.B Invocation .B Invocation
in the in the
.B bison.texinfo .B bison.texi
manual, which should be taken as authoritative. manual, which should be taken as authoritative.
.PP .PP
.I Bison .I Bison

View File

@@ -14,7 +14,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
AM_MAKEINFOFLAGS = --no-split AM_MAKEINFOFLAGS = --no-split
info_TEXINFOS = doc/bison.texinfo info_TEXINFOS = doc/bison.texi
doc_bison_TEXINFOS = \ doc_bison_TEXINFOS = \
$(CROSS_OPTIONS_TEXI) \ $(CROSS_OPTIONS_TEXI) \
doc/fdl.texi \ doc/fdl.texi \

View File

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