diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-12 14:33:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-12 14:33:10 +0000 |
| commit | 2393f1994b273cd1070a273376e9cd3c23494a52 (patch) | |
| tree | bbdca26153470b881ebb4570e53e1f2b48b27d85 | |
| parent | 30492c81c378bd2e3b37a140709b77985d50bb13 (diff) | |
| download | ruby-2393f1994b273cd1070a273376e9cd3c23494a52.tar.gz ruby-2393f1994b273cd1070a273376e9cd3c23494a52.tar.xz ruby-2393f1994b273cd1070a273376e9cd3c23494a52.zip | |
* lib/mkmf.rb: keep curdir unexpanded.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -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 d5fa3e51c..a438e1fae 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 |