summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/extmk.rb.in19
-rw-r--r--ext/tk/tkutil.c2
2 files changed, 12 insertions, 9 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index bb0e042371..2eb6cadf2c 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -286,8 +286,7 @@ LDSHARED = @LDSHARED@
mfile.printf "\
-program_transform_name = -e @program_transform_name@
-RUBY_INSTALL_NAME = `t='$(program_transform_name)'; echo ruby | sed $$t`
+RUBY_INSTALL_NAME = @RUBY_INSTALL_NAME@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -505,6 +504,10 @@ end
exit if $install or $clean
$extinit = "" unless $extinit
+
+ruby = "@RUBY_INSTALL_NAME@@binsuffix@"
+miniruby = "miniruby@binsuffix@"
+
if $extlist.size > 0
for s,t in $extlist
f = format("%s/%s.a", s, t)
@@ -537,8 +540,8 @@ if $extlist.size > 0
Dir.chdir ".."
- if older("ruby@binsuffix@", "#{$top_srcdir}/ext/@setup@") or older("ruby@binsuffix@", "miniruby@binsuffix@")
- `rm -f ruby@binsuffix@`
+ if older(ruby, "#{$top_srcdir}/ext/@setup@") or older(ruby, miniruby)
+ `rm -f #{ruby}`
end
if $extobjs
@@ -549,12 +552,12 @@ if $extlist.size > 0
if PLATFORM =~ /m68k-human|beos/
$extlibs.gsub!("-L/usr/local/lib", "") if $extlibs
end
- system format('make ruby@binsuffix@ EXTOBJS="%s" EXTLIBS="%s"', $extobjs, $extlibs)
+ system format('make #{ruby} EXTOBJS="%s" EXTLIBS="%s"', $extobjs, $extlibs)
else
Dir.chdir ".."
- if older("ruby@binsuffix@", "miniruby@binsuffix@")
- `rm -f ruby@binsuffix@`
- system("make ruby@binsuffix@")
+ if older(ruby, miniruby)
+ system("rm -f #{ruby}")
+ system("make #{ruby}")
end
end
diff --git a/ext/tk/tkutil.c b/ext/tk/tkutil.c
index 58a382a41b..f87b674c6f 100644
--- a/ext/tk/tkutil.c
+++ b/ext/tk/tkutil.c
@@ -30,7 +30,7 @@ tk_s_new(argc, argv, class)
VALUE obj = obj_alloc(class);
rb_funcall2(obj, rb_intern("initialize"), argc, argv);
- if (iterator_p()) rb_yield_0(obj, obj);
+ if (iterator_p()) rb_yield_0(obj, obj, 0);
return obj;
}