summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-05-25 08:26:20 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-05-25 08:26:20 +0000
commit1307f8d555235116f0f0c79b9902df9cfd4bff12 (patch)
treefaf8962d1f1fcdb54db653b4a99b148fdecea7e6 /lib
parent1aba398e29bd9134f83c165a2495883f72cbbb3d (diff)
regexp null pattern
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/debug.rb2
-rw-r--r--lib/getoptlong.rb4
-rw-r--r--lib/mkmf.rb6
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/debug.rb b/lib/debug.rb
index 430d647..ada7170 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 98a73ae..a37714c 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 ad9e839..98ab7e4 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. ####