Permalink
Browse files

* Makefile.in ({,dist-,real-}clean-ext): should also omit

  semicolon when omitting "in WORDS" of FOR-statement.

* tool/rmdirs: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 9d3d606 commit a3de9759e03f6d10f3e2dda43a4081d0e72fa39b @nobu nobu committed Jul 11, 2010
Showing with 6 additions and 7 deletions.
  1. +3 −4 ChangeLog
  2. +2 −2 Makefile.in
  3. +1 −1 tool/rmdirs
View
@@ -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.
View
@@ -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 \
View
@@ -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

0 comments on commit a3de975

Please sign in to comment.