From add4d16477b4332f3bddf0fca111dd5c8816ed9f Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 1 Sep 2008 13:44:54 +0000 Subject: [PATCH] * lib/mkmf.rb (distclean): added RM_RF conftest.dSYM. Fixes distclean-ext problem on Mac OS X. (RM_RF): added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19034 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/mkmf.rb | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7626b4174f..2db9643dd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 1 22:42:54 2008 Yuki Sonoda (Yugui) + + * lib/mkmf.rb (distclean): added RM_RF conftest.dSYM. + Fixes distclean-ext problem on Mac OS X. + (RM_RF): added. + Mon Sep 1 22:37:06 2008 Shugo Maeda * lib/rexml/document.rb: limit entity expansion. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6a95395b97..6ef66344dd 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1380,6 +1380,7 @@ ruby_version = #{RbConfig::CONFIG['ruby_version']} ruby = #{$ruby} RUBY = $(ruby#{sep}) RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'} +RM_RF = #{'$(RUBY) -run -e rm -- -rf'} MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'} INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'} INSTALL_PROG = #{config_string('INSTALL_PROG') || '$(INSTALL) -m 0755'} @@ -1891,6 +1892,7 @@ clean: @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) distclean: clean + @-$(RM_RF) conftest.dSYM @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})