From 4e11d565d3b2e3caad1e791be78e60ee76613401 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 13 Jul 2004 06:54:01 +0000
Subject: [PATCH] * lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH
 in    extmk mode.

* lib/mkmf.rb (dir_config): Prepend a new library path instead of
  appending so it is tried first.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 8 ++++++++
 lib/mkmf.rb | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dab0a4085d..c12edaa12a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jul 13 15:51:45 2004  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
+	   extmk mode.
+
+	* lib/mkmf.rb (dir_config): Prepend a new library path instead of
+	  appending so it is tried first.
+
 Tue Jul 13 00:50:48 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index c8640f55c9..ec5cbf4bb6 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -670,7 +670,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
     ldirs.concat(defaults.collect {|dir| dir + "/lib"})
     ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
   end
-  $LIBPATH |= ldirs
+  $LIBPATH = ldirs | $LIBPATH
 
   [idir, ldir]
 end
@@ -969,8 +969,7 @@ def init_mkmf(config = CONFIG)
   $LIBRUBYARG = ""
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
-  $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
-  $LIBPATH.unshift("$(topdir)") if $extmk
+  $LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
   $INSTALLFILES = nil
 
   $objs = nil