From dac591d01b0f6f85003b0268119da1d3df8527b5 Mon Sep 17 00:00:00 2001 From: nagai Date: Thu, 23 Jul 2009 08:28:49 +0000 Subject: * ext/tk/extconf.rb: should not create "config_list" in a $srcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/extconf.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ext') diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 6a9befd121..c511a20fc7 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1,6 +1,6 @@ ############################################################## # extconf.rb for tcltklib -# release date: 2009-07-15 +# release date: 2009-07-23 ############################################################## require 'mkmf' @@ -22,8 +22,8 @@ end # check configs ############################################################## $cleanfiles << 'config_list' -config_list_file = File.join(File.dirname(__FILE__),'config_list') -config_list_file_source = config_list_file + '.in' +config_list_file = 'config_list' +config_list_file_source = File.join(File.dirname(__FILE__),'config_list.in') if !File.exist?(config_list_file) || File.ctime(config_list_file_source) > File.ctime(config_list_file) old_config_list_file = config_list_file_source @@ -84,13 +84,12 @@ end if update_flag puts "Configure options for Ruby/Tk may be updated." puts "So, delete files which depend on old configs." - File.delete(*(Dir.glob(File.join(File.dirname(__FILE__), - "*.#{CONFIG['DLEXT']}")))) - File.delete(*(Dir.glob(File.join(File.dirname(__FILE__), "*.#{$OBJEXT}")))) - File.delete(File.join(File.dirname(__FILE__), 'Makefile')) rescue nil + File.delete(*Dir.glob("*.#{CONFIG['DLEXT']}")) + File.delete(*Dir.glob("*.#{$OBJEXT}")) + File.delete('Makefile') rescue nil else - makefile = File.join(File.dirname(__FILE__),'Makefile') + makefile = 'Makefile' if File.exist?(makefile) && File.ctime(config_list_file) > File.ctime(makefile) # no need to update Makefile @@ -98,6 +97,7 @@ else end end + ############################################################## # fuctions ############################################################## -- cgit v1.2.3