1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
nobu 2010-07-11 08:01:59 +00:00
parent 9d3d606907
commit a3de9759e0
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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 * Makefile.in ({,dist-,real-}clean-ext): should also omit
FOR-statement is not allowed in /bin/sh on Solaris. fore-ported semicolon when omitting "in WORDS" of FOR-statement.
r28609 from 1.9.2.
* tool/rmdirs: ditto. * tool/rmdirs: ditto.

4
Makefile.in
View File

@ -259,11 +259,11 @@ distclean-rdoc:
clean-ext distclean-ext realclean-ext:: clean-ext distclean-ext realclean-ext::
@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \ @cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
test "$$#" = 0 && set .; \ 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:~$$::'; \ find $$dir -name Makefile | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
done`; shift; \ done`; shift; \
cd ..; \ cd ..; \
for dir in "$$@"; do \ for dir do \
echo $(@:-ext=)ing "$$dir"; \ echo $(@:-ext=)ing "$$dir"; \
(cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \ (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
case "$@" in \ case "$@" in \

2
tool/rmdirs
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
for dir in "$@"; do for dir do
while rmdir "$dir" >/dev/null 2>&1 && while rmdir "$dir" >/dev/null 2>&1 &&
parent=`expr "$dir" : '\(.*\)/[^/][^/]*'`; do parent=`expr "$dir" : '\(.*\)/[^/][^/]*'`; do
case "$parent" in case "$parent" in