From 2af3ad7bc1364b0242db8b1ce8c52d90716ef369 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 31 Jan 2005 15:19:27 +0000 Subject: * Makefile.in, configure.in: made EXTOUT configurable. * ext/extmk.rb (extmake), lib/mkmf.rb: keep topdir as relative style. * lib/mkmf.rb: make extensions in depth order. [ruby-dev:25522] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1976744cb..2c364a016 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1062,8 +1062,12 @@ end Config::CONFIG["srcdir"] = CONFIG["srcdir"] = $srcdir = arg_config("--srcdir", File.dirname($0)) $configure_args["--topsrcdir"] ||= $srcdir -Config::CONFIG["topdir"] = CONFIG["topdir"] = - $curdir = arg_config("--curdir", Dir.pwd) +$curdir = arg_config("--curdir", Dir.pwd) +Config.expand(curdir = $curdir.dup) +unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir) + CONFIG["topdir"] = $curdir + Config::CONFIG["topdir"] = curdir +end $configure_args["--topdir"] ||= $curdir $ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"])) -- cgit