Remove racy commands to build scripts in bin/ and tests/.

* man/Makefile.am (.x.1): Now that scripts in bin/ and tests/
are guaranteed to be built, remove the rules that tried to build
them.  Before, with a parallel build, these rules could lead to
two processes writing tests/wrapper.in concurrently.

diff --git a/ChangeLog b/ChangeLog
index 6b053cec52069c00dd4c3159ff032c0007f9635e..770b9268f5b550ea04ffe73e1614bab4ed62a312 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-11-12  Jim Meyering  <meyering@redhat.com>
 
+       Remove racy commands to build scripts in bin/ and tests/.
+       * man/Makefile.am (.x.1): Now that scripts in bin/ and tests/
+       are guaranteed to be built, remove the rules that tried to build
+       them.  Before, with a parallel build, these rules could lead to
+       two processes writing tests/wrapper.in concurrently.
+
        Build in man/ only *after* building in bin/ and tests/.
        * Makefile.am (SUBDIRS): The man-page-creation process runs $(MAKE)
        in both bin/ and tests/.

diff --git a/man/Makefile.am b/man/Makefile.am
index 406893a10da447e0e1b3955e90fe9620e9acccc5..9485d28d777d556b43cd769df252d4fd3031128e 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autoconf man pages.
 
-# Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2004-2007 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -51,16 +51,7 @@ MOSTLYCLEANFILES = $(srcdir)/*.t
 SUFFIXES = .x .1
 
 .x.1:
-       @program=`expr "/$*" : '.*/\(.*\)'` && \
-       case $$program in \
-       config.*) ;; \
-       *) \
-         for dir in $(top_builddir)/bin $(top_builddir)/tests; do \
-           echo cd $$dir '&&' $(MAKE) $(AM_MAKEFLAGS) $$program && \
-           (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $$program) || exit; \
-         done;; \
-       esac
-       echo "Updating man page $@"
+       @echo "Updating man page $@"
        PATH="$(top_builddir)/tests$(PATH_SEPARATOR)$(top_srcdir)/build-aux$(PATH_SEPARATOR)$$PATH"; \
        export PATH; \
        $(HELP2MAN) \