nobu	2010-02-21 21:20:21 +0900 (Sun, 21 Feb 2010)

  New Revision: 26723

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26723

  Log:
    * lib/mkmf.rb (create_makefile, install_files): honor srcprefix
      argument if given.  [ruby-dev:40449]

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26722)
+++ ChangeLog	(revision 26723)
@@ -1,3 +1,8 @@
+Sun Feb 21 21:20:17 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (create_makefile, install_files): honor srcprefix
+	  argument if given.  [ruby-dev:40449]
+
 Sun Feb 21 13:29:57 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rubygems/rubygems_version.rb: outdated.  [ruby-core:28275]
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 26722)
+++ lib/mkmf.rb	(revision 26723)
@@ -624,7 +624,7 @@
 def install_files(mfile, ifiles, map = nil, srcprefix = nil)
   ifiles or return
   ifiles.empty? and return
-  srcprefix ||= '$(srcdir)'
+  srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
   RbConfig::expand(srcdir = srcprefix.dup)
   dirs = []
   path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
@@ -1684,7 +1684,7 @@
     target_prefix = ""
   end
 
-  srcprefix = "$(srcdir)/#{srcprefix}".chomp('/')
+  srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
   RbConfig.expand(srcdir = srcprefix.dup)
 
   ext = ".#{$OBJEXT}"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/