aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-12 14:33:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-12 14:33:10 +0000
commitd00d9606d123616fd7696c2e9bb26cc640fccc79 (patch)
treeb3cee5980307bf14514734f0908f0f4e3e9059ad /lib
parentb224f1987b8539a38f82a163ec41edab026381d9 (diff)
downloadruby-d00d9606d123616fd7696c2e9bb26cc640fccc79.tar.gz
* lib/mkmf.rb: keep curdir unexpanded.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f1ce3f41e4..157f20ce83 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1242,8 +1242,11 @@ end
Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
$srcdir = arg_config("--srcdir", File.dirname($0))
$configure_args["--topsrcdir"] ||= $srcdir
-$curdir = arg_config("--curdir", Dir.pwd)
-Config.expand(curdir = $curdir.dup)
+if $curdir = arg_config("--curdir")
+ Config.expand(curdir = $curdir.dup)
+else
+ curdir = $curdir = "."
+end
unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir)
CONFIG["topdir"] = $curdir
Config::CONFIG["topdir"] = curdir