diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/tk/extconf.rb | 16 |
2 files changed, 12 insertions, 8 deletions
@@ -1,3 +1,7 @@ +Thu Jul 23 17:26:51 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/extconf.rb: should not create "config_list" in a $srcdir. + Thu Jul 23 14:35:02 2009 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions 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 ############################################################## |