nobu	2007-09-26 23:54:40 +0900 (Wed, 26 Sep 2007)

  New Revision: 13525

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/extmk.rb
    branches/ruby_1_8/lib/mkmf.rb

  Log:
    * ext/extmk.rb (extmake), lib/mkmf.rb (configuration): top_srcdir
      should not prefixed with DESTDIR.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/mkmf.rb?r1=13525&r2=13524
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/extmk.rb?r1=13525&r2=13524
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13525&r2=13524

Index: ruby_1_8/ext/extmk.rb
===================================================================
--- ruby_1_8/ext/extmk.rb	(revision 13524)
+++ ruby_1_8/ext/extmk.rb	(revision 13525)
@@ -135,7 +135,6 @@
 	"topdir" => $topdir,
       }
       mkconfig = {
-	"top_srcdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1],
 	"hdrdir" => "$(top_srcdir)",
 	"srcdir" => "$(top_srcdir)/ext/#{$mdir}",
 	"topdir" => $topdir,
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13524)
+++ ruby_1_8/ChangeLog	(revision 13525)
@@ -1,3 +1,8 @@
+Wed Sep 26 23:54:37 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/extmk.rb (extmake), lib/mkmf.rb (configuration): top_srcdir
+	  should not prefixed with DESTDIR.
+
 Wed Sep 26 08:36:31 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 13524)
+++ ruby_1_8/lib/mkmf.rb	(revision 13525)
@@ -1114,7 +1114,11 @@
 SHELL = /bin/sh
 
 #### Start of system configuration section. ####
-
+#{
+if $extmk
+  "top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/")
+end
+}
 srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote}
 topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
 hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}

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