diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/debug.rb | 2 | ||||
| -rw-r--r-- | lib/getoptlong.rb | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/debug.rb b/lib/debug.rb index 430d6472f6..ada7170e62 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -267,6 +267,6 @@ class DEBUGGER__ CONTEXT = new end -set_trace_func proc{|event, file, line, id, binding| +set_trace_func proc{|event, file, line, id, binding,*rest| DEBUGGER__::CONTEXT.trace_func event, file, line, id, binding } diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb index 98a73ae3db..a37714cafd 100644 --- a/lib/getoptlong.rb +++ b/lib/getoptlong.rb @@ -75,7 +75,7 @@ class GetoptLong # # Whether error messages are output to stderr. # - @quiet_flag = FALSE + @quiet = FALSE # # Status code. @@ -259,7 +259,7 @@ class GetoptLong # Set an error (protected). # def set_error(type, message) - $stderr.print("#{$0}: #{message}\n") if !@quiet_flag + $stderr.print("#{$0}: #{message}\n") if !@quiet @error = type @error_message = message diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ad9e8393aa..98ab7e4670 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -35,10 +35,9 @@ $libdir = CONFIG["libdir"]+"/ruby/"+CONFIG["MAJOR"]+"."+CONFIG["MINOR"] $archdir = $libdir+"/"+CONFIG["arch"] $install = CONFIG["INSTALL_PROGRAM"] $install_data = CONFIG["INSTALL_DATA"] -$ruby_inc = $archdir if $install =~ %r!^[^\s/]+/! then - $install = CONFIG["srcdir"]+"/"+$install - $install_data = CONFIG["srcdir"]+"/"+$install_data + $install = CONFIG["compile_dir"]+"/"+$install + $install_data = CONFIG["compile_dir"]+"/"+$install_data end if File.exist? $archdir + "/ruby.h" @@ -361,7 +360,6 @@ prefix = #{CONFIG["prefix"]} exec_prefix = #{CONFIG["exec_prefix"]} libdir = #{$libdir} archdir = #{$archdir} -ruby_inc = #{$ruby_inc} #### End of system configuration section. #### |