Merge branch 'maint'

Conflicts:
	Makefile.in
	NEWS
	configure.ac
	xshogi/parser.y
	xshogi/scanner.l

diff --cc Makefile.am
index 85930b1,0000000..5239b43
mode 100644,000000..100644
--- 1/Makefile.am
--- /dev/null
+++ b/Makefile.am
@@@ -1,34 -1,0 +1,34 @@@
 +#
 +# Makefile for GNU Shogi
 +#
 +# Copyright (c) 2013 Yann Dirson and the Free Software Foundation
 +#
 +# This file is part of GNU Shogi.
 +#
 +# GNU Shogi is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 1, or (at your option)
 +# any later version.
 +#
 +# GNU Shogi is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with GNU Shogi; see the file COPYING.  If not, write to
 +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
- SUBDIRS = gnushogi xshogi doc
++SUBDIRS = gnushogi doc
 +
 +dist_noinst_DATA = \
 +      README.maint \
 +      ChangeLog.old \
 +      misc/gnushogi.pat \
 +      misc/gnuminishogi.pat \
 +      misc/gnushogi.tbk \
 +      misc/gnuminishogi.tbk
 +
 +dist_doc_DATA = \
 +      CONTRIB

diff --cc NEWS
index caf5bc3,312e854..fc0694d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,11 +1,15 @@@
  GNU shogi news
  --------------
  
 +Changes in version 1.5.0 (unreleased):
 +
 +* Build system switched from pure autoconf to automake
 +
+ Changes in version 1.4.2 (unreleased):
+ 
+ * XShogi is no longer included in the GNU Shogi source, it is
+   available as a separate source archive.
+ 
  Changes in version 1.4.1 (01/2014):
  
  * Initial support for the MiniShogi variant, for now as a separate

diff --cc configure.ac
Simple merge

diff --cc doc/Makefile.am
index c9d76ad,0000000..fab0a4d
mode 100644,000000..100644
--- 1/doc/Makefile.am
--- /dev/null
+++ b/doc/Makefile.am
@@@ -1,38 -1,0 +1,37 @@@
 +#
 +# Documentation Makefile for GNU Shogi
 +#
 +# Copyright (c) 2013 Yann Dirson and the Free Software Foundation
 +#
 +# This file is part of GNU Shogi.
 +#
 +# GNU Shogi is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 1, or (at your option)
 +# any later version.
 +#
 +# GNU Shogi is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with GNU Shogi; see the file COPYING.  If not, write to
 +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 +#
 +
 +info_TEXINFOS = gnushogi.texi
 +AM_MAKEINFOHTMLFLAGS = --split=section
 +
- dist_man_MANS = gnushogi.6 @XSHOGIMAN@
- EXTRA_MANS = xshogi.6
++dist_man_MANS = gnushogi.6
 +
 +dist_doc_DATA = \
 +      BOOKFILES \
 +      PORTING \
 +      shogi.rules \
 +      tutorial1.gam \
 +      tutorial2.gam
 +
 +spell:
 +      tr '[A-Z]' '[a-z]' < $(srcdir)/gnushogi.texi | tr -cd '[A-Za-z0-9_ \012]' | \
 +      tr -s '[ ]' '\012' | sort | uniq -c | sort -nr | spell | sort | uniq