From 2af3ad7bc1364b0242db8b1ce8c52d90716ef369 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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
---
 ext/extmk.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ext')

diff --git a/ext/extmk.rb b/ext/extmk.rb
index 16bb339f4..67fedc67d 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -82,6 +82,7 @@ def extmake(target)
 	$defs = []
 	Logging::logfile 'mkmf.log'
 	Config::CONFIG["srcdir"] = $srcdir
+	Config::CONFIG["topdir"] = $topdir
 	rm_f makefile
 	begin
 	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
@@ -317,7 +318,7 @@ exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
   d = File.dirname(d)
   d.slice!(0, ext_prefix.length + 1)
   d
-} unless $extension
+}.sort unless $extension
 
 if $extout
   Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir))
-- 
cgit