From 7a8405300c6b117a9a7fe6200de90e5cca48a759 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 12 Jul 2005 14:33:10 +0000 Subject: * 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 --- ChangeLog | 4 ++++ lib/mkmf.rb | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8bce27c85..61fe6e2e7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 12 23:32:11 2005 Nobuyoshi Nakada + + * lib/mkmf.rb: keep curdir unexpanded. + Mon Jul 11 08:31:29 2005 Nobuyoshi Nakada * regex.c (read_special): fix parsing backslashes following \c in diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d5fa3e51c5..a438e1faec 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 -- cgit v1.2.3