diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-06-26 17:13:36 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-06-26 17:14:36 +0200 |
| commit | 22b081deb7ab1d0ec7a279e5213fa7fdc2c85207 (patch) | |
| tree | 7e6e572b565e1d4b9cbd1908244385a0543c5c83 /doc/local.mk | |
| parent | 297e263a0050959e0fd139ad66e71383fc9ac4db (diff) | |
| parent | 9bcffa0c13d1abee13433f14cdb785cbb960425c (diff) | |
| download | bison-22b081deb7ab1d0ec7a279e5213fa7fdc2c85207.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
maint: use *.texi.
Conflicts:
doc/Makefile.am
examples/calc++/Makefile.am
Diffstat (limited to 'doc/local.mk')
| -rw-r--r-- | doc/local.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/local.mk b/doc/local.mk index f7a96c23..54c03ebf 100644 --- 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 \ |