From 46556e87f7f89f4e7ef1bd7ea7bedf1e58f35769 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 09:55:18 +0000
Subject: merges r20965 from trunk into ruby_1_9_1. * configure.in (Makefile):
 removes GNU make specific files on   distclean.

* Makefile.in (distclean-ext): removes extension directories.

* lib/mkmf.rb (try_do): removes conftest.dSYM

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 615b89842..5686f8137 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -194,6 +194,10 @@ def rm_f(*files)
   FileUtils.rm_f(Dir[*files])
 end
 
+def rm_rf(*files)
+  FileUtils.rm_rf(Dir[*files])
+end
+
 # Returns time stamp of the +target+ file if it exists and is newer
 # than or equal to all of +times+.
 def modified?(target, times)
@@ -361,6 +365,7 @@ MSG
   xsystem(command)
 ensure
   log_src(src)
+  rm_rf 'conftest.dSYM'
 end
 
 def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
@@ -1894,7 +1899,6 @@ clean:
 \t\t@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
 
 distclean: clean
-\t\t@-$(RM_RF) conftest.dSYM
 \t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 \t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
 
-- 
cgit