From 08046447bb17f2effa6e67da63c19f2820638555 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Jul 2006 03:12:45 +0000
Subject: * ext/extmk.rb, lib/mkmf.rb (with_destdir): remove drive letter
 before   prepending destdir on DOSISH.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/mkmf.rb')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index e711bb2dc4..f0e783595f 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -61,6 +61,7 @@ $netbsd = /netbsd/ =~ RUBY_PLATFORM
 $os2 = /os2/ =~ RUBY_PLATFORM
 $beos = /beos/ =~ RUBY_PLATFORM
 $solaris = /solaris/ =~ RUBY_PLATFORM
+$dest_prefix_pattern = (File::PATH_SEPARATOR == ';' ? /\A([[:alpha:]]:)?/ : /\A/)
 
 def config_string(key, config = CONFIG)
   s = config[key] and !s.empty? and block_given? ? yield(s) : s
@@ -911,7 +912,8 @@ def pkg_config(pkg)
 end
 
 def with_destdir(dir)
-  /^\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
+  dir = dir.sub($dest_prefix_pattern, '')
+  /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
 end
 
 def winsep(s)
@@ -941,18 +943,17 @@ topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
 hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}
 VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
 }
-  drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/
-  if destdir = CONFIG["prefix"].scan(drive)[0] and !destdir.empty?
+  if $destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
     mk << "\nDESTDIR = #{destdir}\n"
   end
   CONFIG.each do |key, var|
     next unless /prefix$/ =~ key
-    mk << "#{key} = #{with_destdir(var.sub(drive, ''))}\n"
+    mk << "#{key} = #{with_destdir(var)}\n"
   end
   CONFIG.each do |key, var|
     next if /^abs_/ =~ key
     next unless /^(?:src|top|hdr|(.*))dir$/ =~ key and $1
-    mk << "#{key} = #{with_destdir(var.sub(drive, ''))}\n"
+    mk << "#{key} = #{with_destdir(var)}\n"
   end
   if !$extmk and !$configure_args.has_key?('--ruby') and
       sep = config_string('BUILD_FILE_SEPARATOR')
-- 
cgit v1.2.3