mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/mkmf.rb: keep curdir unexpanded.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b224f1987b
commit
d00d9606d1
2 changed files with 9 additions and 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 23:50:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Mon Jul 11 23:50:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* eval.c, intern.h (rb_proc_call, rb_obj_method, rb_method_call):
|
* eval.c, intern.h (rb_proc_call, rb_obj_method, rb_method_call):
|
||||||
|
|
|
@ -1242,8 +1242,11 @@ end
|
||||||
Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
|
Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
|
||||||
$srcdir = arg_config("--srcdir", File.dirname($0))
|
$srcdir = arg_config("--srcdir", File.dirname($0))
|
||||||
$configure_args["--topsrcdir"] ||= $srcdir
|
$configure_args["--topsrcdir"] ||= $srcdir
|
||||||
$curdir = arg_config("--curdir", Dir.pwd)
|
if $curdir = arg_config("--curdir")
|
||||||
Config.expand(curdir = $curdir.dup)
|
Config.expand(curdir = $curdir.dup)
|
||||||
|
else
|
||||||
|
curdir = $curdir = "."
|
||||||
|
end
|
||||||
unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir)
|
unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir)
|
||||||
CONFIG["topdir"] = $curdir
|
CONFIG["topdir"] = $curdir
|
||||||
Config::CONFIG["topdir"] = curdir
|
Config::CONFIG["topdir"] = curdir
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue