automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 2/2] Avoid an unportable use of `$status' shell variable.


From: Stefano Lattarini
Subject: [PATCH 2/2] Avoid an unportable use of `$status' shell variable.
Date: Tue, 30 Mar 2010 17:54:03 +0200
User-agent: KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.2; i686; ; )

* 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).

---
From 97341ae53095a428dba37bc6afb4c768261beb52 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Tue, 30 Mar 2010 17:36:13 +0200
Subject: [PATCH 2/2] 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).
---
 ChangeLog   |    8 ++++++++
 Makefile.am |    4 ++--
 Makefile.in |    4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 69c811b..0c733de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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).
+
+2010-03-30  Stefano Lattarini  <address@hidden>
+
        Avoid another use of `chmod -R'.
 
        * Makefile.am (path-check): To be safe, do not use `chmod -R' on
diff --git a/Makefile.am b/Makefile.am
index 86fb240..6c24285 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -534,10 +534,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=$$?; \
+         estatus=$$?; \
          find $(distdir) -type d '!' -perm -200 -exec chmod u+w {} ';'; \
          rm -rf $(distdir); \
-         exit $$status
+         exit $$estatus
 
 ## Program to use to fetch files.
 WGET = wget
diff --git a/Makefile.in b/Makefile.in
index f146ce9..d4aa111 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1245,10 +1245,10 @@ git-diff:
 path-check: distdir
        (cd $(distdir) && \
          find . -print | xargs pathchk -p); \
-         status=$$?; \
+         estatus=$$?; \
          find $(distdir) -type d '!' -perm -200 -exec chmod u+w {} ';'; \
          rm -rf $(distdir); \
-         exit $$status
+         exit $$estatus
 
 fetch:
        rm -rf Fetchdir > /dev/null 2>&1
-- 
1.6.5


reply via email to

[Prev in Thread] Current Thread [Next in Thread]