* doc/automake.texi (Multiple Outputs): Fix the multiple outputs

with locking example.

diff --git a/ChangeLog b/ChangeLog
index 986ceb8049136ca525895c3b4e9f9f42883439b9..81e1c99185e4ba0e15f6375febce24f470c136c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-27 Bruno Haible  <bruno@clisp.org>
+
+       * doc/automake.texi (Multiple Outputs): Fix the multiple outputs
+       with locking example.
+
 2007-01-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/automake.texi (Subpackages): Fix ambiguous wording.

diff --git a/doc/automake.texi b/doc/automake.texi
index da75509eac29aef197165499d1fd304a41cc9cbd..debc51b04586d60871339eadc7e225c016b25566 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -10657,18 +10657,19 @@ along the following lines.
 data.c data.h data.w data.x: data.stamp
 ## Recover from the removal of $@@
         @@if test -f $@@; then :; else \
-          trap 'rm -rf data.lock data.stamp 1 2 13 15; \
+          trap 'rm -rf data.lock data.stamp' 1 2 13 15; \
 ## mkdir is a portable test-and-set
           if mkdir data.lock 2>/dev/null; then \
 ## This code is being executed by the first process.
             rm -f data.stamp; \
             $(MAKE) $(AM_MAKEFLAGS) data.stamp; \
+            result=$$?; rm -rf data.lock; exit $$result; \
           else \
 ## This code is being executed by the follower processes.
 ## Wait until the first process is done.
             while test -d data.lock; do sleep 1; done; \
 ## Succeed if and only if the first process succeeded.
-            test -f data.stamp; exit $$?; \
+            test -f data.stamp; \
           fi; \
         fi
 @end example

diff --git a/doc/stamp-vti b/doc/stamp-vti
index 604c6643be90373243025eb323aa688a3c9ef773..e57627b226988de6380f2a0fc1a15bc7a905c426 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 28 October 2006
-@set UPDATED-MONTH October 2006
+@set UPDATED 27 January 2007
+@set UPDATED-MONTH January 2007
 @set EDITION 1.10a
 @set VERSION 1.10a

diff --git a/doc/version.texi b/doc/version.texi
index 604c6643be90373243025eb323aa688a3c9ef773..e57627b226988de6380f2a0fc1a15bc7a905c426 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 28 October 2006
-@set UPDATED-MONTH October 2006
+@set UPDATED 27 January 2007
+@set UPDATED-MONTH January 2007
 @set EDITION 1.10a
 @set VERSION 1.10a