From d0a6f8d62f49ce7426d3db868741302233d58ce7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 17 Feb 2004 10:34:31 +0000
Subject: * ext/extmk.rb (extmake): $extout_prefix doesn't vary for libraries.

* ext/extmk.rb (extmake): remove compile directory if empty.

* ext/extmk.rb (parse_args) lib/mkmf.rb (create_makefile): move
  initialization of $extout_prefix from lib/mkmf.rb.  [ruby-dev:22928]

* ext/extmk.rb: clear ext and extout directory when cleaning.

* lib/mkmf.rb (CLEANLIBS): should be under $(arch) directory.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 189c49612..6f6592b5d 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -819,8 +819,6 @@ def create_makefile(target, srcprefix = nil)
     target_prefix = ""
   end
 
-  $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
-
   srcprefix ||= '$(srcdir)'
   Config::expand(srcdir = srcprefix.dup)
 
@@ -898,7 +896,7 @@ RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
 }
   end
   mfile.print %{
-CLEANLIBS     = #{$extout_prefix}$(TARGET).{#{CONFIG['DLEXT']},#{$LIBEXT},exp,il?,tds,map}
+CLEANLIBS     = #{$extout ? '$(RUBYARCHDIR)/' : ''}$(TARGET).{#{CONFIG['DLEXT']},exp,il?,tds,map}
 CLEANOBJS     = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.bak
 
 all:		#{target ? $extout ? "install" : "$(DLLIB)" : "Makefile"}
@@ -1025,6 +1023,7 @@ def init_mkmf(config = CONFIG)
   $distcleanfiles = []
 
   $extout ||= nil
+  $extout_prefix ||= nil
 
   dir_config("opt")
 end
-- 
cgit