From: Stefano Lattarini Date: Tue, 30 Mar 2010 15:36:13 +0000 (+0200) Subject: Avoid an unportable use of `$status' shell variable. X-Git-Tag: v1.11.1b~88^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d14b29a7e4b0d788808a1fa54318502e9edf5864;p=thirdparty%2Fautomake.git 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). --- diff --git a/ChangeLog b/ChangeLog index 99e0f5ff0..f746f0e0a 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 82e1aef55..c48787468 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 dd81522b3..9fd4acf96 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