From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 27 Jan 2007 16:32:12 +0000 (+0000)
Subject: * doc/automake.texi (Multiple Outputs): Fix the multiple outputs
X-Git-Tag: v1.10b~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d82eb8922bb898a389b82a802afbaead514030db;p=thirdparty%2Fautomake.git

* doc/automake.texi (Multiple Outputs): Fix the multiple outputs
with locking example.
---

diff --git a/ChangeLog b/ChangeLog
index 986ceb804..81e1c9918 100644
--- 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 da75509ea..debc51b04 100644
--- 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 604c6643b..e57627b22 100644
--- 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 604c6643b..e57627b22 100644
--- 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