From 16d775d94e172a8cf869b1fe84f10e90d8d324dc Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 16 Feb 2013 16:10:55 +0000 Subject: * tool/mkconfig.rb: remove prefix from rubyarchdir. r39267 expands variables, it changes expansion timing, breaks RbConfig::CONFIG["includedir"] and building extension libraries with installed ruby. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/mkconfig.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tool') diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index e4a925cd51..92c765499f 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -167,7 +167,7 @@ def vars.expand(val, config = self) val end vars["prefix"] = "" -prefix = vars.expand(vars["rubyarchdir"]) +prefix = vars.expand(vars["rubyarchdir"]).sub!(vars.expand(vars["exec_prefix"]), '') print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print <<'ARCH' if universal -- cgit v1.2.3