From 2b071787d2d5f572eb5f41262b6610bfde5eabb1 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 6 Aug 2010 08:40:27 +0000
Subject: * Makefile.in: ignore error from RMDIRS.

* enc/depend: ditto.

* lib/mkmf.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   |  8 ++++++++
 Makefile.in |  4 ++--
 enc/depend  | 10 ++++++----
 lib/mkmf.rb |  7 ++++---
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12b939f142..8dc8244092 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug  6 17:35:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Makefile.in: ignore error from RMDIRS.
+
+	* enc/depend: ditto.
+
+	* lib/mkmf.rb: ditto.
+
 Fri Aug  6 05:53:32 2010  Tanaka Akira  <akr@fsij.org>
 
 	* ext/pathname/pathname.c (path_mtime): Pathname#mtime translated from
diff --git a/Makefile.in b/Makefile.in
index 3a789dde53..31a36fc6e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -253,7 +253,7 @@ distclean-local::
 	@$(RM) ext/config.cache $(RBCONFIG) Doxyfile
 	@-$(RM) run.gdb
 	@-$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
-	@-$(RMDIRS) $(arch_hdrdir)/ruby
+	@-$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
 
 distclean-rdoc:
 	@$(RMALL) $(RDOCOUT:/=\)
@@ -270,7 +270,7 @@ clean-ext distclean-ext realclean-ext::
 	    (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
 	    case "$@" in \
 	    *distclean-ext*|*realclean-ext*) \
-		$(RMDIRS) "$$dir";; \
+		$(RMDIRS) "$$dir" 2> /dev/null || true;; \
 	    esac; \
 	done
 
diff --git a/enc/depend b/enc/depend
index 6705beb2bf..7d196934d4 100644
--- a/enc/depend
+++ b/enc/depend
@@ -132,12 +132,14 @@ clean:
 % %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
 	@$(RM) <%=pathrep[clean]%>
 % end
+% @ignore_error = $nmake ? '' : '2> /dev/null || true'
 % %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir|
-	@-$(RMDIR) <%=pathrep[dir]%>
+	@-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
 % end
 
 clean-srcs:
 	@$(RM) <%=pathrep['$(TRANSCSRCS)']%>
-% %w[enc/trans enc].each do|dir|
-	@-$(RMDIR) <%=pathrep[dir]%>
-% end
+	@-$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
+	@$(RM) enc/unicode/name2ctype.h
+	@-$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
+	@-$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 9cec5f196c..af31d371bd 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1813,6 +1813,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
   mfile.print "install: install-so install-rb\n\n"
   sodir = (dir = "$(RUBYARCHDIR)").dup
   mfile.print("install-so: ")
+  @ignore_error = $nmake ? '' : '2> /dev/null || true'
   if target
     f = "$(DLLIB)"
     dest = "#{dir}/#{f}"
@@ -1820,7 +1821,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
     if $extout
       mfile.print "clean-so::\n"
       mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
-      mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}\n"
+      mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}#{@ignore_error}\n"
     else
       mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n"
       mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n"
@@ -1861,7 +1862,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
       unless dirs.empty?
         mfile.print("clean-rb#{sfx}::\n")
         for dir in dirs.sort_by {|d| -d.count('/')}
-          mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}\n")
+          mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}#{@ignore_error}\n")
         end
       end
     end
@@ -2095,7 +2096,7 @@ distclean-so::
 distclean: clean distclean-so distclean-rb-default distclean-rb
 \t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 \t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
-\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})
+\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{@ignore_error}
 
 realclean: distclean
 "
-- 
cgit v1.2.3