[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-43-g89ffd67

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=89ffd676db1d91a9d127974b9ca6c2d0839eb70e

The branch, branch-1.11 has been updated
       via  89ffd676db1d91a9d127974b9ca6c2d0839eb70e (commit)
       via  d14b29a7e4b0d788808a1fa54318502e9edf5864 (commit)
       via  8ff479ac3e3dd7f79d72088e8dceeec16c75240e (commit)
      from  1c0fa92e23a10f7f695a2f7e68a9e516b6fc101b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 89ffd676db1d91a9d127974b9ca6c2d0839eb70e
Merge: 1c0fa92e23a10f7f695a2f7e68a9e516b6fc101b 
d14b29a7e4b0d788808a1fa54318502e9edf5864
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 4 08:44:46 2010 +0200

    Merge branch 'maint' into branch-1.11

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |   13 +++++++++++++
 Makefile.am |    7 ++++---
 Makefile.in |    7 ++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b28f68..61bef24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-30  Stefano Lattarini  <address@hidden>
+
+       Avoid an unportable use of `$status' shell variable.
+       * Makefile.am (path-check): Don't use the `$status' shell variable
+       in the target's rules, as it's special in Zsh (equivalent to `$?',
+       and readonly).
+
+       Avoid another use of `chmod -R'.
+       * Makefile.am (path-check): To be safe, do not use `chmod -R' on
+       $(distdir) before removing it (as Solaris `chmod -R' touches
+       symlink targets).  Instead, use the cleanup strategy used in
+       distdir.am.
+
 2010-03-28  Ralf Wildenhues  <address@hidden>
 
        Remove uses of @acronym and @sc.
diff --git a/Makefile.am b/Makefile.am
index d176d7b..c487874 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -482,9 +482,10 @@ path-check: distdir
 ## FIXME there's got to be a better way!  pathchk should take the list
 ## of files on stdin, at least.
          find . -print | xargs pathchk -p); \
-         status=$$?; \
-         chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \
-         exit $$status
+         estatus=$$?; \
+         find $(distdir) -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+         rm -rf $(distdir); \
+         exit $$estatus
 
 ## Program to use to fetch files.
 WGET = wget
diff --git a/Makefile.in b/Makefile.in
index 263c6b6..db2d52f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1152,9 +1152,10 @@ git-diff:
 path-check: distdir
        (cd $(distdir) && \
          find . -print | xargs pathchk -p); \
-         status=$$?; \
-         chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \
-         exit $$status
+         estatus=$$?; \
+         find $(distdir) -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+         rm -rf $(distdir); \
+         exit $$estatus
 
 fetch:
        rm -rf Fetchdir > /dev/null 2>&1


hooks/post-receive
-- 
GNU Automake