summaryrefslogtreecommitdiff
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
commit7a8405300c6b117a9a7fe6200de90e5cca48a759 (patch)
treebbdca26153470b881ebb4570e53e1f2b48b27d85
parentcbbfcf51a3fa352a0d03ea644f2fa1ef5c6dfd31 (diff)
* lib/mkmf.rb: keep curdir unexpanded.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb7
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f8bce27..61fe6e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 12 23:32:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb: keep curdir unexpanded.
+
Mon Jul 11 08:31:29 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* regex.c (read_special): fix parsing backslashes following \c in
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index d5fa3e5..a438e1f 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1236,8 +1236,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