diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rwxr-xr-x | tool/rmdirs | 2 |
3 files changed, 6 insertions, 7 deletions
@@ -1,8 +1,7 @@ -Sun Jul 11 15:36:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jul 11 17:01:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> - * Makefile.in ({,dist-,real-}clean-ext): omission of "in WORDS" of - FOR-statement is not allowed in /bin/sh on Solaris. fore-ported - r28609 from 1.9.2. + * Makefile.in ({,dist-,real-}clean-ext): should also omit + semicolon when omitting "in WORDS" of FOR-statement. * tool/rmdirs: ditto. diff --git a/Makefile.in b/Makefile.in index ee2f2b5e1f..02cfa1c3e7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -259,11 +259,11 @@ distclean-rdoc: clean-ext distclean-ext realclean-ext:: @cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \ test "$$#" = 0 && set .; \ - set dummy `for dir in "$$@"; do \ + set dummy `for dir do \ find $$dir -name Makefile | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \ done`; shift; \ cd ..; \ - for dir in "$$@"; do \ + for dir do \ echo $(@:-ext=)ing "$$dir"; \ (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \ case "$@" in \ diff --git a/tool/rmdirs b/tool/rmdirs index 1dde99f547..6dcf984df6 100755 --- a/tool/rmdirs +++ b/tool/rmdirs @@ -1,5 +1,5 @@ #!/bin/sh -for dir in "$@"; do +for dir do while rmdir "$dir" >/dev/null 2>&1 && parent=`expr "$dir" : '\(.*\)/[^/][^/]*'`; do case "$parent" in |