Skip to content

Commit

Permalink
* Makefile.in ({,dist-,real-}clean-ext): should also omit
Browse files Browse the repository at this point in the history
  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
nobu committed Jul 11, 2010
1 parent 9d3d606 commit a3de975
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
7 changes: 3 additions & 4 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Sun Jul 11 15:36:20 2010 Nobuyoshi Nakada <[email protected]>
Sun Jul 11 17:01:57 2010 Nobuyoshi Nakada <[email protected]>

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

Expand Down
4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tool/rmdirs
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit a3de975

Please sign in to comment.