From 3c276224fc8c508a718c912bd0f6297d2435bc7e Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 11 Oct 2008 01:20:20 +0000 Subject: * lib/mkmf.rb (CLEANINGS): uses escaped form tabs to preventing the confusion. [ruby-talk:317345] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/mkmf.rb | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7943b47346..51473c5720 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 11 10:20:17 2008 Nobuyoshi Nakada + + * lib/mkmf.rb (CLEANINGS): uses escaped form tabs to preventing the + confusion. [ruby-talk:317345] + Sat Oct 11 08:51:13 2008 Nobuyoshi Nakada * lib/rake.rb (Rake::Application#standard_exception_handling): removed diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 76692f187f..d95d748078 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1342,7 +1342,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} else sep = "" end - extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ")<<" " + extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " " mk << %{ CC = #{CONFIG['CC']} CXX = #{CONFIG['CXX']} @@ -1618,8 +1618,8 @@ TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB) CLEANLIBS = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}} CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, '$(TARGET)')}} *.bak -all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} -static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} +all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} +static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} " mfile.print CLEANINGS dirs = [] @@ -1889,14 +1889,14 @@ MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || 'int main() {return 0; sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if sep != "/"} || "" CLEANINGS = " clean: - @-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) +\t\t@-$(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}) +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}) -realclean: distclean +realclean: distclean " if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0) -- cgit v1.2.3