From d14b29a7e4b0d788808a1fa54318502e9edf5864 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Tue, 30 Mar 2010 17:36:13 +0200 Subject: [PATCH] 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 | 5 +++++ Makefile.am | 4 ++-- Makefile.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99e0f5f..f746f0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-03-30 Stefano Lattarini + 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 diff --git a/Makefile.am b/Makefile.am index 82e1aef..c487874 100644 --- a/Makefile.am +++ b/Makefile.am @@ -482,10 +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=$$?; \ + 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 dd81522..9fd4acf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1152,10 +1152,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 -- 2.7.4