Fix m4.1 build race, exposed by parallelism through GNUmakefile.

* Makefile.am (SUBDIRS): Add doc.
(Documentation rules): Move ...
* doc/Makefile.am: ... to this new file.
* configure.ac (AC_CONFIG_FILES): Generate doc/Makefile.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

4 files changed, 54 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 3769414e..43819ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix m4.1 build race, exposed by parallelism through GNUmakefile.
+	* Makefile.am (SUBDIRS): Add doc.
+	(Documentation rules): Move ...
+	* doc/Makefile.am: ... to this new file.
+	* configure.ac (AC_CONFIG_FILES): Generate doc/Makefile.
+
 2009-03-13  Eric Blake  <ebb9@byu.net>
 
 	Try to tolerate spaces in directory names in testsuite.
diff --git a/Makefile.am b/Makefile.am
index 01140c67..6e207a98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 config_aux_dir	= build-aux
 config_macro_dir= ltdl/m4
 
-SUBDIRS		= po gnu . tests/gnu
+SUBDIRS		= po gnu . doc tests/gnu
 
 ACLOCAL_AMFLAGS = -I ltdl/m4
 AUTOMAKE_OPTIONS = nostdinc
@@ -245,38 +245,6 @@ dist-hook:
 EXTRA_DIST     += m4/system_.h
 
 
-## -------------- ##
-## Documentation. ##
-## -------------- ##
-
-info_TEXINFOS	= doc/m4.texinfo
-doc_m4_TEXINFOS	= doc/regexprops-generic.texi doc/fdl-1.3.texi doc/gpl-3.0.texi
-dist_man_MANS	= $(srcdir)/doc/m4.1
-EXTRA_DIST	+= doc/gendocs_template
-MAINTAINERCLEANFILES += doc/gendocs_template
-HELP2MAN	= $(SHELL) $(srcdir)/$(config_aux_dir)/missing --run help2man
-
-# Build the man page once in the srcdir, rather than in every VPATH build
-# dir, to match how automake builds info pages.  This is safe for 'make
-# distcheck' since it is distributed pre-built.
-$(srcdir)/doc/m4.1: .version src/main.c
-	@if test -f src/m4$(EXEEXT); then \
-	  echo "Updating the \`man' page \`$@'"; \
-	  $(HELP2MAN) --name="macro processor" --source=FSF \
-	    --info-page=m4 --output=$@ src/m4$(EXEEXT); \
-	else \
-	  echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
-	  echo "         Retry once the program executable is ready."; \
-	fi
-
-## Disabled for now.  Clashes with earlier definition.
-## TAGS_FILES	= $(infos_TEXINFOS)
-## TAGS_DEPENDENCIES = $(TAGS_FILES)
-## ETAGS_ARGS	= --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES)
-
-MAINTAINERCLEANFILES += $(dist_man_MANS)
-
-
 ## --------- ##
 ## Examples. ##
 ## --------- ##
diff --git a/configure.ac b/configure.ac
index ba57e399..ec8ff460 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,6 +225,7 @@ M4_SYSCMD
 AC_CONFIG_FILES([
 Makefile
 gnu/Makefile
+doc/Makefile
 m4/system.h:m4/system_.h
 tests/atlocal
 tests/gnu/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 00000000..8d9a6fbd
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,44 @@
+## Makefile.am - template for generating Makefile via Automake
+##
+## Copyright (C) 2009  Free Software Foundation, Inc.
+##
+## This file is part of GNU M4.
+##
+## GNU M4 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 3 of the License, or
+## (at your option) any later version.
+##
+## GNU M4 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+MAINTAINERCLEANFILES =
+EXTRA_DIST =
+config_aux_dir = build-aux
+
+info_TEXINFOS	= m4.texinfo
+m4_TEXINFOS	= regexprops-generic.texi fdl-1.3.texi gpl-3.0.texi
+dist_man_MANS	= $(srcdir)/m4.1
+EXTRA_DIST	+= gendocs_template
+MAINTAINERCLEANFILES += gendocs_template
+HELP2MAN	= $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run help2man
+
+# Build the man page once in the srcdir, rather than in every VPATH build
+# dir, to match how automake builds info pages.  This is safe for 'make
+# distcheck' since it is distributed pre-built.
+$(srcdir)/m4.1: ../.version $(srcdir)/../src/main.c
+	@echo "Updating the \`man' page \`$@'"; \
+	$(HELP2MAN) --name="macro processor" --source=FSF \
+	  --info-page=m4 --output=$@ ../src/m4$(EXEEXT)
+
+TAGS_FILES	= $(infos_TEXINFOS)
+TAGS_DEPENDENCIES = $(TAGS_FILES)
+ETAGS_ARGS	= --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES)
+
+MAINTAINERCLEANFILES += $(dist_man_MANS)
+