[前][次][番号順一覧][スレッド一覧]

ruby-changes:16615

From: yugui <ko1@a...>
Date: Sun, 11 Jul 2010 00:50:23 +0900 (JST)
Subject: [ruby-changes:16615] Ruby:r28609 (ruby_1_9_2): * Makefile.in ({|dist-|real-}clean-ext): fixes syntax

yugui	2010-07-11 00:50:08 +0900 (Sun, 11 Jul 2010)

  New Revision: 28609

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28609

  Log:
    * Makefile.in ({|dist-|real-}clean-ext): fixes syntax 
      for /bin/sh on Solaris
    
    * tool/rmdirs: ditto

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/Makefile.in
    branches/ruby_1_9_2/tool/rmdirs

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28608)
+++ ruby_1_9_2/ChangeLog	(revision 28609)
@@ -1,3 +1,10 @@
+Sat Jul 10 20:03:48 2010  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* Makefile.in ({|dist-|real-}clean-ext): fixes syntax 
+	  for /bin/sh on Solaris
+
+	* tool/rmdirs: ditto
+
 Thu Jul  8 15:47:34 2010  NARUSE, Yui  <naruse@r...>
 
         * string.c (rb_str_conv_enc_opts): fix infinite loop because
Index: ruby_1_9_2/Makefile.in
===================================================================
--- ruby_1_9_2/Makefile.in	(revision 28608)
+++ ruby_1_9_2/Makefile.in	(revision 28609)
@@ -257,20 +257,22 @@
 	@$(RMALL) $(RDOCOUT:/=\)
 
 clean-ext distclean-ext realclean-ext::
-	@cd ext; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
-	test "$$#" = 0 && set .; \
-	set dummy `for dir; do \
-	    find $$dir -name Makefile | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
-	done`; shift; \
-	cd ..; \
-	for dir; do \
-	    echo $(@:-ext=)ing "$$dir"; \
-	    (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
-	    case "$@" in \
-	    *distclean-ext*|*realclean-ext*) \
-		$(RMDIRS) "ext/$$dir";; \
-	    esac; \
-	done
+	@if [ -d ext ]; then \
+	    cd ext; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
+	    test "$$#" = 0 && set .; \
+	    set dummy `for dir in $$*; do \
+	        find $$dir -name Makefile | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
+	    done`; shift; \
+	    cd ..; \
+	    for dir in $$*; do \
+	        echo $(@:-ext=)ing "$$dir"; \
+	        (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
+	        case "$@" in \
+	        *distclean-ext*|*realclean-ext*) \
+		    $(RMDIRS) "ext/$$dir";; \
+	        esac; \
+	    done \
+	fi
 
 distclean-ext realclean-ext::
 	@-rmdir ext 2> /dev/null || true
Index: ruby_1_9_2/tool/rmdirs
===================================================================
--- ruby_1_9_2/tool/rmdirs	(revision 28608)
+++ ruby_1_9_2/tool/rmdirs	(revision 28609)
@@ -1,5 +1,5 @@
 #!/bin/sh
-for dir; do
+for dir in $$*; do
     while rmdir "$dir" >/dev/null 2>&1 &&
           parent=`expr "$dir" : '\(.*\)/[^/][^/]*'`; do
         case "$parent" in

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]