From 3976feed73bf4ec27183824870ee077c2b5b00b1 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Feb 1999 04:31:29 +0000
Subject: 990224

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/extmk.rb.in | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'ext/extmk.rb.in')

diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index d422b32322..ceadc4dd77 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -294,8 +294,7 @@ LDSHARED = @LDSHARED@
 
   mfile.printf "\
 
-#program_transform_name = -e @program_transform_name@
-#RUBY_INSTALL_NAME = `t='$(program_transform_name)'; echo @RUBY_INSTALL_NAME@ | sed $$t`
+RUBY_INSTALL_NAME = @RUBY_INSTALL_NAME@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -449,7 +448,7 @@ def extmake(target)
       elsif $clean
 	system "make clean"
       else
-	system "make all"
+	system "make all" or exit
       end
     end
     if $static
@@ -514,6 +513,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)
@@ -546,8 +549,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)
+    system("rm -f #{ruby}")
   end
 
   if $extobjs
@@ -558,12 +561,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_INSTALL_NAME@@binsuffix@", "miniruby@binsuffix@")
-    `rm -f @RUBY_INSTALL_NAME@@binsuffix@`
-    system("make @RUBY_INSTALL_NAME@@binsuffix@")
+  if older(ruby, miniruby)
+    system("rm -f #{ruby}")
+    system("make #{ruby}")
   end
 end
 
-- 
cgit v1.2.3