Index: ChangeLog
from  Akim Demaille  <address@hidden>

	* build-aux/Makefile.am: Ship cross-options.pl.
	* doc/Makefile.am: Always refer to cross-options.texi with
	$(srcdir).
	(MAINTAINERCLEANFILES): Add it.

Index: build-aux/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/build-aux/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- build-aux/Makefile.am 21 Oct 2005 09:13:01 -0000 1.1
+++ build-aux/Makefile.am 5 Nov 2007 06:36:10 -0000
@@ -1,2 +1,2 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-EXTRA_DIST = prev-version.txt
+EXTRA_DIST = prev-version.txt cross-options.pl
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/doc/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- doc/Makefile.am 4 Nov 2007 21:17:55 -0000 1.16
+++ doc/Makefile.am 5 Nov 2007 06:36:10 -0000
@@ -16,7 +16,12 @@
 
 AM_MAKEINFOFLAGS = --no-split
 info_TEXINFOS = bison.texinfo
-bison_TEXINFOS = cross-options.texi gpl-3.0.texi fdl.texi
+bison_TEXINFOS = $(srcdir)/cross-options.texi gpl-3.0.texi fdl.texi
+
+CLEANFILES = bison.fns
+CLEANDIRS = *.t2d
+clean-local:
+	rm -rf $(CLEANDIRS)
 
 CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
 $(srcdir)/cross-options.texi: $(top_srcdir)/src/getargs.c $(CROSS_OPTIONS_PL)
@@ -24,18 +29,13 @@
 	cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS) bison
 	$(top_builddir)/src/bison --help | perl $(CROSS_OPTIONS_PL) >address@hidden
 	mv address@hidden $@
-
-CLEANFILES = bison.fns
-CLEANDIRS = *.t2d
-clean-local:
-	rm -rf $(CLEANDIRS)
+MAINTAINERCLEANFILES = $(srcdir)/cross-options.texi
 
 ## ---------- ##
 ## Ref card.  ##
 ## ---------- ##
 
 EXTRA_DIST = refcard.tex
-
 CLEANFILES += refcard.dvi refcard.log refcard.ps
 
 refcard.dvi: refcard.tex
@@ -51,7 +51,7 @@
 dist_man_MANS = $(srcdir)/bison.1
 
 EXTRA_DIST += $(dist_man_MANS:.1=.x) common.x
-MAINTAINERCLEANFILES = $(dist_man_MANS)
+MAINTAINERCLEANFILES += $(dist_man_MANS)
 
 # Depend on configure.ac to get version number changes.
 common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x